Your Name 2 years ago
parent
commit
e643396cb6
3 changed files with 32 additions and 8 deletions
  1. 15 0
      service/agent/database/member.php
  2. 2 0
      service/agent/database/order.php
  3. 15 8
      service/bill/lib/Cron.php

+ 15 - 0
service/agent/database/member.php

@@ -1000,6 +1000,21 @@ return array
             'col' => '*',
         ),
 
+        'guidian' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'role' => 'yes',
+                'start' => array('yes-cdate','>='),
+                'parent_mid' => 'yes',
+                'prize_type' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'col' => '*',
+        ),
+
         'getDataByName' => array
         (
             # 匹配的正则或函数 选填项

+ 2 - 0
service/agent/database/order.php

@@ -980,6 +980,7 @@ return array
                 'start' => array('yes-cdate','>='),
                 'end' => array('yes-cdate','<='),
                 'mid' => 'yes',
+                'parent_mid' => 'yes',
                 'state' => 1,
             ),
             'type' => 'one',
@@ -993,6 +994,7 @@ return array
                 'start' => array('yes-cdate','>='),
                 'end' => array('yes-cdate','<='),
                 'mid' => 'yes',
+                'parent_mid' => 'yes',
                 'role' => array('yes','in'),
                 'state' => 1,
             ),

+ 15 - 8
service/bill/lib/Cron.php

@@ -495,6 +495,7 @@ class Cron
             foreach($logs as $l => $lv){
                 if($lv['new_shop_id'] == $sv['id']){
                     $sv['mid'][] = $lv['mid'];
+                    $sv['cdate'][] = $lv['cdate'];
                     $shops[] = $sv;
                 }else{
                     unset($shops[$s]);
@@ -507,6 +508,7 @@ class Cron
             $rest[$va['id']]=$va;
         }
         $shop=array_values($rest);
+        // print_R($shop);die;
         foreach($shop as $k => $v){
             #采购金额
             $shop[$k]['c_money'] = Dever::db('shop/buy_order')->getCashNum(array('type'=>1,'type_id'=>$v['id'],'state'=>1));
@@ -521,15 +523,20 @@ 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));
-                #代理商业绩
-                $shop[$k]['money'][] = Dever::db('agent/order')->getCount(array('mid'=>$v1,'state'=>1));
-                #除去创V的代理商业绩
-                $shop[$k]['dl_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$v1,'role'=>'1,2,3,4,5,6,7','state'=>1));
-                #创V名额外业绩
-                $out = Dever::db('agent/member')->find(array('id'=>$v1,'role'=>8,'prize_type'=>1));
-                if(isset($out) && $out){
-                    $shop[$k]['out_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$out['id'],'role'=>8,'state'=>1));
+                foreach($v['cdate'] as $v2){
+                    #代理商业绩
+                    $shop[$k]['money'][] = Dever::db('agent/order')->getCount(array('parent_mid'=>$v1,'start'=>$v2,'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));
+                    #创V名额外业绩
+                    $out = Dever::db('agent/member')->guidian(array('parent_mid'=>$v1,'start'=>$v2,'role'=>8,'prize_type'=>1));
+                    if(isset($out) && $out){
+                        foreach($out as $v3){
+                            $shop[$k]['out_money'][] = Dever::db('agent/order')->getVCount(array('parent_mid'=>$v3['id'],'start'=>$v2,'role'=>8,'state'=>1));
+                        }
+                    }
                 }
+                
              }
             #除创V的代理商数量
             if(isset($shop[$k]['dl_num']) && $shop[$k]['dl_num']){