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

application/library/Our/ArrayConst.php

@@ -115,7 +115,7 @@ class ArrayConst
     const orderCloseTemplate=array(
         'type'=>14,
         'title'=>'订单关闭通知',
-        'content'=>'您的订单超过10分钟没人接单，自动关闭',
+        'content'=>'您的订单{0}超过10分钟没人接单，自动关闭',
         'thumb'=>'',
         'href'=>'',
         'price'=>0

application/models/Business/Order/OrderService.php

@@ -417,7 +417,8 @@ class OrderServiceModel extends \Business\AbstractModel
         $push = Push::getInstance();
         $push->recieveWait($order['storeId'], $order['orderId'], $order['orderSn']);
         $push->sendTcpMessage();
-        $this->addMessageCenterToDb();
+        $messageService=\Business\Message\MessageServiceModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+        $messageService->addMessageCenterToDb();
     }
     //推送接单消息到店铺
     public function pushRecieveWaitOrder()