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

service/agent/lib/Member.php

@@ -698,6 +698,7 @@ class Member
         $where['mid'] = $id;
         $where['state'] = 1;
         $where['type'] = 2;
+        $where['stype'] = 1;
         $info = Dever::db('bill/sell')->getNewChildParent($where);
         $temp = array();
         $sell = 0;
@@ -736,6 +737,7 @@ class Member
         $where['mid'] = $id;
         $where['state'] = 1;
         $where['type'] = 2;
+        $where['stype'] = 1;
         $info = Dever::db('bill/sell')->getNewParent($where);
 
         $total = sprintf ('%01.2f',$info['total']);

service/bill/database/sell.php

@@ -309,6 +309,7 @@ return array
                 'end' => array('yes-cdate','<='),
                 'mid' => 'yes',
                 'type' => 'yes',
+                'stype' => 'yes',
                 'state' => 1,
             ),
             'type' => 'one',
@@ -324,6 +325,7 @@ return array
                 'end' => array('yes-cdate','<='),
                 'mid' => 'yes',
                 'type' => 'yes',
+                'stype' => 'yes',
                 'state' => 1,
             ),
             'group' => 'child_mid',

service/bill/lib/Cron.php

@@ -483,7 +483,14 @@ class Cron
     }
     #归店统计
     public function shop_stat_api(){
-        $month = Dever::input('month', date('Y-m'));
+        $month = Dever::input('month');
+        $y = date('Y');
+        $m = date('m')-1;
+        if($month){
+            $month = $month;
+        }else{
+            $month = $y.'-'.'0'.$m;
+        }
         $start_time = $month .'-01 00:00:00';
         $end_time = date('Y-m-d', strtotime($start_time. ' +1 month -1 day')).' 23:59:59';
         $start = Dever::maketime($start_time);
@@ -499,7 +506,8 @@ class Cron
             foreach($logs as $l => $lv){
                 if($lv['new_shop_id'] == $sv['id']){
                     $sv['mid'][] = $lv['mid'];
-                    $sv['cdate'][] = $lv['cdate'];
+                    $sv['cdate'][] = Dever::maketime(date('Y-m-01', $lv['cdate']) . ' 00:00:00');
+                    // $lv['cdate'];
                     $shops[] = $sv;
                 }else{
                     unset($shops[$s]);