Your Name 2 rokov pred
rodič
commit
168943b667

+ 1 - 0
service/agent/database/member_goods.php

@@ -464,6 +464,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
+                'mid' => 'yes',
                 'type' => 'yes',
                 'type_id' => 'yes',
                 'state' => 1,

+ 2 - 8
service/agent/lib/Dhorder.php

@@ -1239,16 +1239,11 @@ class Dhorder
         }else{
             $data = Dever::db('agent/member_goods')->getExcelAll(array('state'=>1));
         }
-        $header = array('权益名称', '会员等级', '姓名', '手机号', '获取方式', '获取时间', '使用时间', '使用单号');
+        $header = array('权益名称', '会员等级', '姓名', '手机号', '获取方式', '获取时间');
         $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']));
-            $dhorder = Dever::db('agent/dh_order')->find(array('mid'=>$v['mid']));
-            $dcdate = '';
-            if($dhorder['cdate']){
-                $dcdate = date('Y-m-d H:i',$dhorder['cdate']);
-            }
             $d = array
             (
                 $v['name'],
@@ -1257,8 +1252,7 @@ class Dhorder
                 $member['mobile'],
                 '',
                 date('Y-m-d H:i',$v['cdate']),
-                $dcdate,
-                $dhorder['order_num'],
+                
             );
             $body[] = $d;
         }

+ 11 - 2
service/agent/lib/Order.php

@@ -1461,12 +1461,21 @@ class Order
             $quanyi = Dever::load('manage/api')->getLog($member_goods_log['id'], 'agent', 'member_goods_log', 1);
             $admin = Dever::load('manage/admin-find',$quanyi['admin']);
             $qy = $admin['username'];
-            $qydate = date('Y-m-d H:i',$member_goods_log['cdate']);
+            $qydate = '';
+            $member_goods = Dever::db('agent/member_goods')->getQone(array('mid'=>$v['mid'],'state'=>1));
+            if($member_goods['cdate']){
+                $qydate = date('Y-m-d H:i',$member_goods['cdate']);
+            }
+            
             $order_cash = Dever::db('agent/order_cash')->find(array('order_id'=>$v['id']));
             $fenrun = Dever::load('manage/api')->getLog($order_cash['id'], 'agent', 'order_cash', 1);
             $admin = Dever::load('manage/admin-find',$fenrun['admin']);
             $fr = $admin['username'];
-            $frdate = date('Y-m-d H:i',$order_cash['cdate']);
+            $frdate = '';
+            if($order_cash['cdate']){
+                $frdate = date('Y-m-d H:i',$order_cash['cdate']);
+            }
+            
             foreach($process as $key => $val){
                 $log = Dever::load('manage/api')->getLog($val['id'], 'agent', 'order_process', 1);
                 if($val['status'] == 1){