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

application/models/Business/Order/OrderService.php

@@ -405,6 +405,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $type=ApiConst::messageWaitGet;
                 }else{
                     $type=ApiConst::messageWaitSend;
+
                 }
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['store_id'],
@@ -521,6 +522,7 @@ class OrderServiceModel extends \Business\AbstractModel
     {
         $baseConfDir = \Our\Common::getConfig('out.config');
         $savePath = $baseConfDir . \Our\PathConst::orderWaitRecieveTaskAddTime;
+        $messageService=\Business\Message\MessageServiceModel::getInstance();
         $addTime = file_get_contents($savePath);
         $addTime = $addTime ? $addTime : ApiConst::zero;
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
@@ -535,6 +537,7 @@ class OrderServiceModel extends \Business\AbstractModel
             $pageBegin++;
         } while (!empty($orders['list']));
         $push->sendTcpMessage();
+        $messageService->addMessageCenterToDb();
         file_put_contents($savePath, TIMESTAMP);
     }
 

scripts/crontab/push/jpush.php

@@ -74,9 +74,11 @@ class cliOrderClose extends basecli
     }
     protected function autoPushClient(){
         $push=\Our\Push::getInstance();
+        $messageService=\Business\Message\MessageServiceModel::getInstance();
         while($pushData=\Our\RedisHelper::lpop('client_push')){
             if($pushData['type']==\Our\ApiConst::messageReceiveOrderType){
                 $push->recievedOrder($pushData['storeId'],$pushData['orderId']);
+                $messageService->addMessageCenterToDb();
                 continue;
             }
             $push->addOneToClient($pushData);