Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/Store/ShopkeeperService.php

@@ -662,7 +662,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $this->taskIndex = PageConst::taskPageBegin;
         $this->taskSize = PageConst::taskPageSize;
         do {
-            $storeMemberStatisticData = $orderGoodDao->getMemberStoreStaticsByCreateTime($beginTime, $this->taskIndex, $this->taskSize);
+            $storeMemberStatisticData = $orderDao->getMemberStoreStaticsByCreateTime($beginTime, $this->taskIndex, $this->taskSize);
             $storeMemberStatisticData = isset($storeMemberStatisticData['list']) ? $storeMemberStatisticData['list'] : false;
             if ($storeMemberStatisticData) {
                 $this->taskIndex++;

application/models/DAO/Order/Order.php

@@ -421,7 +421,7 @@ class OrderModel extends \DAO\AbstractModel
     }
     public function getMemberStoreStaticsByCreateTime($gmtCreate,$pageIndex,$pageSize){
         $this->setDb($this->dbName);
-        $where =\Our\Common::format(' gmt_update>={0} and gmt_update<{1} and order_state={2}',$gmtCreate,TIMESTAMP,ApiConst::orderStateWaitRecieve);
+        $where =\Our\Common::format(' gmt_update>={0} and gmt_update<{1} and order_state not in({2},{3},{4})',$gmtCreate,TIMESTAMP,ApiConst::orderStateWaitRecieve);
         $res=$this->lists($where,array('gmt_update'=>'asc'),$this->sumField,$pageIndex,$pageSize);
         return $res['list']?$res:false;
     }

scripts/crontab/shopkeeper/index.php

@@ -71,7 +71,8 @@ class cliShopkeeperIndex extends basecli
         $shopkeeperService->baseDir= \Our\Common::getConfig('out.config');
         try {
             $shopkeeperService->insertStoreMemberStatics();
-            $shopkeeperService->reduceStoreMemberStatics();
+            //退货退款订单自动关闭
+           // $shopkeeperService->reduceStoreMemberStatics();
             //$shopkeeperService->storeStatictisTask();
             $shopkeeperService->updateLastId();
         } catch (Exception $ex) {