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

service/agent/lib/Order.php

@@ -1855,7 +1855,7 @@ class Order
     }
 
     public  function out_guidian($data){
-        $header = array('代理商名称', '电话', '角色', '审核完成时间','上级代理商姓名','上级代理商电话', '归店业绩', '门店名称', '门店编号', '归店时间');
+        $header = array('代理商名称', '电话', '角色', '审核完成时间','上级代理商姓名','上级代理商电话', '归店业绩', '门店名称', '门店编号', '创V名额外业绩', '归店时间');
         $body = array();
         foreach($data as $k => $v){
             $member_shop = Dever::db('agent/member_shop_log')->find(array('mid'=>$v['parent_mid']));
@@ -1865,6 +1865,10 @@ class Order
                     $parent_member = Dever::db('agent/member')->find(array('id'=>$v['parent_mid']));
                     $role = Dever::db('setting/role')->find($member['role']);
                     $shop = Dever::db('shop/info')->find($member_shop['new_shop_id']);
+                    $start = strtotime(date('Y-m-01',$v['fdate']));
+                    $one = date('Y-m-d',$start);
+                    $end = strtotime(date('Y-m-d 23:59:59',strtotime($one."+1 month - 1 day")));;
+                    $shop_stat = Dever::db('bill/shop_stat')->getList(array('start'=>$start,'end'=>$end,'shop_id'=>$shop['id']));
                     $fdate = '';
                     if ($v['fdate']) {
                         $fdate = date('Y-m-d H:i',$v['fdate']);
@@ -1884,6 +1888,7 @@ class Order
                         $v['price'],
                         $shop['name'],
                         $shop['sid'],
+                        $shop_stat['total'],
                         $gcdate,
                     );
                      $body[] = $d;

service/bill/database/shop_stat.php

@@ -198,6 +198,18 @@ $config = array
             'list_order' => 8,
         ),
 
+        'nei_money'      => array
+        (
+            'type'      => 'decimal-11,2',
+            'name'      => '名额内创V<br/>业绩',
+            'default'   => '0',
+            'desc'      => '创V名额内业绩',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            // 'list'      => true,
+            // 'list_order' => 9,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -251,6 +263,20 @@ $config = array
             'type' => 'all',
             'col' => '*',
         ),
+
+        'getList' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'start' => array('yes-month', '>='),
+                'end' => array('yes-month', '<='),
+                'shop_id' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'one',
+            'col' => 'sum(out_money) as total',
+        ),
     ),
 );
 

service/bill/lib/Cron.php

@@ -555,6 +555,13 @@ class Cron
                             $shop[$k]['out_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$v3['id'],'start'=>$v['cdate'][$k1],'end'=>$end,'role'=>8,'state'=>1));
                         }
                     }
+                    #创V名额内业绩
+                    $nei = Dever::db('agent/member')->guidian(array('parent_mid'=>$v1,'start'=>$v['cdate'][$k1],'role'=>8,'prize_type'=>2));
+                    if(isset($nei) && $nei){
+                        foreach($nei as $v3){
+                            $shop[$k]['nei_money'][] = Dever::db('agent/order')->getVCount(array('mid'=>$v3['id'],'start'=>$v['cdate'][$k1],'end'=>$end,'role'=>8,'state'=>1));
+                        }
+                    }
                 // }
                 
              }
@@ -603,6 +610,13 @@ class Cron
             }else{
                 $shop[$key]['out_money'] = 0;
             }
+
+            #创V名额内业绩
+            if(isset($val['nei_money']) && $val['nei_money']){
+                $shop[$key]['nei_money'] = array_sum(array_map(function($val){return $val['total'];}, $val['nei_money']));
+            }else{
+                $shop[$key]['nei_money'] = 0;
+            }
            
             $insert['shop_id'] = $val['id'];
             $insert['mids'] = $val['mids'];
@@ -616,6 +630,7 @@ class Cron
             $insert['month'] = $start;
             $insert['out_num'] = $val['out_num'];
             $insert['out_money'] = $shop[$key]['out_money'];
+            $insert['nei_money'] = $shop[$key]['nei_money'];
 
             if($insert){
                 $res = Dever::db('bill/shop_stat')->getState(array('start'=>$start,'end'=>$end,'shop_id'=>$insert['shop_id'],'state'=>1));