edit

service/agent/database/member_shop_log.php

@@ -117,7 +117,7 @@ return array
             # 只有insert时才生效
             'insert'    => true,
             'search'    => $search_auth == 1 ? 'date' : false,
-            'list'      => 'date("Y-m-d", {cdate})',
+            'list'      => 'date("Y-m-d H:i", {cdate})',
             'order'     => 'desc',
         ),
     ),
@@ -155,7 +155,7 @@ return array
                 'state' => 1,
             ),
             'type' => 'all',
-            // 'order' => array('cdate' => 'desc'),
+            'order' => array('cdate' => 'asc'),
             'col' => '*',
         ),
     ),

service/agent/database/order.php

@@ -982,8 +982,8 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'start' => array('yes-cdate','>='),
-                'end' => array('yes-cdate','<='),
+                'start' => array('yes-fdate','>='),
+                'end' => array('yes-fdate','<='),
                 'mid' => 'yes',
                 'parent_mid' => 'yes',
                 'state' => 1,
@@ -996,8 +996,8 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'start' => array('yes-cdate','>='),
-                'end' => array('yes-cdate','<='),
+                'start' => array('yes-fdate','>='),
+                'end' => array('yes-fdate','<='),
                 'mid' => 'yes',
                 'parent_mid' => 'yes',
                 'role' => array('yes','in'),

service/bill/lib/Cron.php

@@ -490,6 +490,10 @@ class Cron
         $end = Dever::maketime($end_time);
         $shops = Dever::db('shop/info')->getAll();
         $logs = Dever::db('agent/member_shop_log')->getGui(array('start'=>$start,'end'=>$end,'state'=>1));
+        foreach($logs as $a => $b){
+            $log[$b['mid']]=$b;
+        }
+        $logs=array_values($log);
         // print_R($logs);die;
         foreach($shops as $s=>$sv){
             foreach($logs as $l => $lv){
@@ -523,19 +527,19 @@ class Cron
                 $shop[$k]['v_num'][] = Dever::db('agent/member')->getCount(array('id'=>$v1,'role'=>8,'state'=>1));
                 #创V名额外数量
                 $shop[$k]['out_num'][] = Dever::db('agent/member')->getCount(array('id'=>$v1,'role'=>8,'prize_type'=>1,'state'=>1));
-                foreach($v['cdate'] as $v2){
+                // foreach($v['cdate'][$k1] as $v2){
                     #代理商业绩
-                    $shop[$k]['money'][] = Dever::db('agent/order')->getCount(array('parent_mid'=>$v1,'start'=>$v2,'state'=>1));
+                    $shop[$k]['money'][] = Dever::db('agent/order')->getCount(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'state'=>1));
                     #除去创V的代理商业绩
-                    $shop[$k]['dl_money'][] = Dever::db('agent/order')->getVCount(array('parent_mid'=>$v1,'start'=>$v2,'role'=>'1,2,3,4,5,6,7','state'=>1));
+                    $shop[$k]['dl_money'][] = Dever::db('agent/order')->getVCount(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'role'=>'1,2,3,4,5,6,7','state'=>1));
                     #创V名额外业绩
-                    $out = Dever::db('agent/member')->guidian(array('parent_mid'=>$v1,'start'=>$v2,'role'=>8,'prize_type'=>1));
+                    $out = Dever::db('agent/member')->guidian(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'role'=>8,'prize_type'=>1));
                     if(isset($out) && $out){
                         foreach($out as $v3){
-                            $shop[$k]['out_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$v3['id'],'start'=>$v2,'role'=>8,'state'=>1));
+                            $shop[$k]['out_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$v3['id'],'start'=>$v['cdate'][$k1],'role'=>8,'state'=>1));
                         }
                     }
-                }
+                // }
                 
              }
             #除创V的代理商数量