Your Name 2 years ago
parent
commit
06688304ba
2 changed files with 7 additions and 8 deletions
  1. 1 1
      service/agent/database/order.php
  2. 6 7
      service/bill/lib/Cron.php

+ 1 - 1
service/agent/database/order.php

@@ -1002,7 +1002,7 @@ return array
                 'parent_mid' => 'yes',
                 'role' => array('yes','in'),
                 'status' => 4,
-                // 'state' => 1,
+                'state' => 1,
             ),
             'type' => 'one',
             'col' => 'sum(price) as total',

+ 6 - 7
service/bill/lib/Cron.php

@@ -505,7 +505,6 @@ class Cron
             $log[$b['mid']]=$b;
         }
         $logs=array_values($log);
-        // print_R($logs);die;
         foreach($shops as $s=>$sv){
             foreach($logs as $l => $lv){
                 if($lv['new_shop_id'] == $sv['id']){
@@ -524,9 +523,8 @@ class Cron
             $rest[$va['id']]=$va;
         }
         $shop=array_values($rest);
-        // print_R($shop);die;
         foreach($shop as $k => $v){
-            
+            // $end = strtotime(date('Y-m-d 23:59:59',strtotime(date('Y-m-01',$v['cdate'][$k1])."+1 month - 1 day")));
             #采购金额
             $shop[$k]['c_money'] = Dever::db('shop/buy_order')->getCashNum(array('type'=>1,'type_id'=>$v['id'],'state'=>1));
             #代理商的总数量
@@ -542,15 +540,16 @@ class Cron
                 $shop[$k]['out_num'][] = Dever::db('agent/member')->getCount(array('id'=>$v1,'role'=>8,'prize_type'=>1,'state'=>1));
                 // foreach($v['cdate'][$k1] as $v2){
                     #代理商业绩
-                    $shop[$k]['money'][] = Dever::db('agent/order')->getCount(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'state'=>1));
+                    $shop[$k]['money'][] = Dever::db('agent/order')->getCount(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'end'=>$end,'state'=>1));
                     #除去创V的代理商业绩
-                    $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'));
-                    // echo Dever::sql();die;
+                     $end = strtotime(date('Y-m-d 23:59:59',strtotime(date('Y-m-01',$v['cdate'][$k1])."+1 month - 1 day")));
+                    $shop[$k]['dl_money'][] = Dever::db('agent/order')->getVCount(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'end'=>$end,'role'=>'1,2,3,4,5,6,7'));
+                    
                     #创V名额外业绩
                     $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'=>$v['cdate'][$k1],'role'=>8,'state'=>1));
+                            $shop[$k]['out_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$v3['id'],'start'=>$v['cdate'][$k1],'end'=>$end,'role'=>8,'state'=>1));
                         }
                     }
                 // }