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

service/agent/lib/Order.php

@@ -1865,10 +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']));
+                    $shop_stat = '';
+                    if ($member['prize_type'] == 1 && $member['role'] == 8) {
+                        $shop_stat = $v['price'];
+                    }
                     $fdate = '';
                     if ($v['fdate']) {
                         $fdate = date('Y-m-d H:i',$v['fdate']);
@@ -1888,7 +1888,7 @@ class Order
                         $v['price'],
                         $shop['name'],
                         $shop['sid'],
-                        $shop_stat['total'],
+                        $shop_stat,
                         $gcdate,
                     );
                      $body[] = $d;

service/bill/database/shop_stat.php

@@ -263,20 +263,6 @@ $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',
-        ),
     ),
 );