closeRefund

application/models/Business/Order/OrderService.php

@@ -987,13 +987,16 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         file_put_contents($this->baseDir . \Our\PathConst::orderCancelTime, $endTime);
     }
-    public function changeOrderStatusSecond()
+    public function changeOrderStatusSecond($bTime=false)
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $endTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder);
         $endTime = $endTime ? $endTime : ApiConst::zero;
         $beginTime = $endTime - ApiConst::halfDaySecond;
         $storeDao=\DAO\StoreModel::getInstance();
+        if($bTime){
+            $beginTime=0;
+        }
         // $beginTime=0;
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
         $newOrders=array();

application/models/DAO/Order/Order.php

@@ -1007,7 +1007,7 @@ class OrderModel extends \DAO\AbstractModel
     public function getMustCecelRecieveOrders($beginTime=ApiConst::zero, $endTime, $field = '*')
     {
         $this->setDb($this->dbName);
-        $where=Common::format(" add_time between {0} and {1} and order_state={2}",$beginTime,$endTime,ApiConst::orderStateWaitConfirm);
+        $where=Common::format(" order_state={2} and add_time between {0} and {1} ",$beginTime,$endTime,ApiConst::orderStateWaitConfirm);
         $list = $this->db->select($field)->from($this->_tableName)->where($where)->order('add_time','desc')->fetchAll();
         return $list;
     }

scripts/crontab/order/closeSecond.php

@@ -43,7 +43,7 @@ class cliOrderClose extends basecli
     protected function autoCloseOrder(){
         $orderService=\Business\Order\OrderServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $orderService->baseDir= \Our\Common::getConfig('out.config');
-        $orderService->changeOrderStatusSecond();
+        $orderService->changeOrderStatusSecond(true);
         $messageService=\Business\Message\MessageServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $messageService->addMessageCenterToDb();
     }
@@ -61,7 +61,7 @@ class cliOrderClose extends basecli
             echo '****create dir fail  ****';
             exit;
         }
-        $this->lockFileName = $lockDir .DS.'close.locks';
+        $this->lockFileName = $lockDir .DS.'closeSecond.locks';
         if( file_exists( $this->lockFileName ) )
         {
             $stat = stat($this->lockFileName);