Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/shop/src/Excel.php

@@ -255,6 +255,7 @@ class Excel
                             $cdate,
                             $paydate,
                             $operdate,
+                            $fdate,
 
                             '',
                             '',

app/shop/src/My.php

@@ -39,13 +39,23 @@ class My extends Core
 
 		$this->data['level'] = 'Lv1';
 
+		$this->getBindInfo();
+
+		return $this->data;
+	}
+
+	public function getBindInfo()
+	{
 		# 获取代理商绑定信息
 		$bind = Dever::db('agent/user_bind')->find(array('uid' => $this->uid));
 		if ($bind && $bind['status'] == 2 && $bind['mid']) {
+			$this->data['bind_info'] = $bind;
 			$this->data['bind_status'] = $bind['status'];
 			$this->data['bind_desc'] = $bind['audit_desc'];
 			$this->data['agent'][] = Dever::load('agent/lib/member')->getInfo($bind['mid']);
 		} elseif ($bind && $bind['status'] != 2) {
+			$this->data['bind_info'] = $bind;
+			$this->data['agent'][] = Dever::load('agent/lib/member')->getInfo($bind['mid']);
 			$this->data['bind_status'] = $bind['status'];
 			$this->data['bind_desc'] = $bind['audit_desc'];
 		} else {

service/agent/database/member_agreement.php

@@ -440,6 +440,7 @@ return array
             'option' => array
             (
                 'mid' => 'yes',
+                'status' => array('yes', 'in'),
                 'state' => 1,
             ),
             'type' => 'all',

service/agent/lib/Dhorder.php

@@ -1172,32 +1172,27 @@ class Dhorder
         if($end){
             $where['end']=strtotime($end);
         }
-        $header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品规格', '商品数量', '商品原价','订单状态','下单时间', '付款时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
+        $header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品数量', '商品原价','订单状态','下单时间', '付款时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
         $data = Dever::db('agent/dh_order')->getExcelAll($where);
         $body = array();
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
             $role = Dever::db('setting/role')->find(array('id'=>$member['role']));
-            $address = Dever::db('agent/member_address')->find(array('id'=>$v['address_id']));
-            $res=Dever::load('agent/address')->getOne($address['mid'],$address['id']);
-            $goods = Dever::db('agent/dh_order_goods')->select(array('order_id' => $v['id']));
-            foreach ($goods as $k1 => $v1) {
-                $num = $v1['num'];
-                $price = $v1['price'];
-                $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
-                if (isset($goods_info['sku'])) {
-                    $sku = $goods_info['sku']['string'];
-                } else {
-                    $sku = '';
+            $address = $res = array();
+            if ($v['address_id'] && $v['address_id'] > 0) {
+                $address = Dever::db('agent/member_address')->find(array('id'=>$v['address_id']));
+                if ($address) {
+                    $res=Dever::load('agent/address')->getOne($address['mid'],$address['id']);
                 }
             }
+            
             $fdate = '';
             if($v['fdate']){
                 $fdate = date('Y-m-d H:i',$v['fdate']);
             }
             $quanyi = '';
             $member_goods = Dever::db('agent/member_goods')->getQone(array('type'=>$v['type'],'type_id'=>$v['type_id']));
-            if($member_goods['cdate']){
+            if($member_goods && $member_goods['cdate']){
                 $quanyi = date('Y-m-d H:i',$member_goods['cdate']);
             }
             
@@ -1209,13 +1204,12 @@ class Dhorder
                 $member['name'],
                 $role['name'],
                 $member['mobile'],
-                $address['contact'],
-                $address['mobile'],
-                $res['address_info'].$address['house_number'],
-                $goods_info['name'],
-                $sku,
-                $num,
-                $price,
+                isset($address['contact']) ? $address['contact'] : '',
+                isset($address['mobile']) ? $address['mobile'] : '',
+                (isset($res['address_info']) ? $res['address_info'] : '').(isset($address['house_number']) ? $address['house_number'] : ''),
+                $v['name'],
+                $v['num'],
+                $v['price'],
                 $status,
                 date('Y-m-d H:i',$v['cdate']),
                 date('Y-m-d H:i',$v['cdate']),

service/agent/lib/Manage.php

@@ -594,7 +594,7 @@ class Manage
                     return false;
                 }
             } elseif ($card['create_type'] == 3) {
-                $cash = round($order['price']*($v['num']/100), 2);
+                $cash = round($order['soft_cash']*($v['num']/100), 2);
                 $price = $cash;
                 $v['num'] = 1;
                 $v['sku_id'] = Dever::load('card/lib/code')->create($card, 2, $order['mid'], $order['id'], $cash);

service/agent/lib/Order.php

@@ -1330,7 +1330,7 @@ class Order
                 } elseif ($v['type'] == 2) {
                     $card = Dever::db('card/info')->find($v['type_id']);
                     if ($card['create_type'] == 3) {
-                        $card['value'] = round($info['price']*($v['num']/100), 2);
+                        $card['value'] = round($info['soft_cash']*($v['num']/100), 2);
                         $v['num'] = $v['num'] . '%';
                     } else {
                         $v['num'] = $v['num'] * $t;

service/agent/src/My.php

@@ -923,6 +923,7 @@ class My extends Core
     public function getAgreement()
     {
         $where['mid'] = $this->uid;
+        $where['status'] = '1,2';
         $this->data['list'] = Dever::db('agent/member_agreement')->getAll($where);
 
         if ($this->data['list']) {

service/option/database/account.php

@@ -400,6 +400,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
+                'id' => array('yes', 'in'),
                 'mid' => 'yes',
                 'is_email' => 'yes',
                 'is_idcard' => 'yes',