pc

application/library/Our/Push.php

@@ -108,6 +108,7 @@ class Push
             $convert['toType'] = ApiConst::memberMessageType;
             $convert['message'] = ArrayConst::orderCloseTemplate;
             $convert['message']['href'] = "orderId=" . $data['orderId'];
+            $convert['message']['content']=Common::format($convert['message']['content'],$data['orderSn']);
             $convert['message'] = serialize($convert['message']);
             $id = time().(string)$this->orderIdStr.$data['orderId'];
             $convert['id'] =$id;
@@ -193,7 +194,11 @@ class Push
     public function recieveWait($storeId,$orderId,$orderSn)
     {
         $storeDao=\DAO\StoreModel::getInstance();
-        $store = $storeDao->getInfo(array('store_id'=>$storeId));
+        $condition['store_id'] = $storeId;
+        $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this->storeDao, 'getInfo'), array($condition), ApiConst::oneDaySecond, array($storeId));
+        //$store = $storeDao->getInfo(array('store_id'=>$storeId));
+        $orderService=\Business\Order\OrderServiceModel::getInstance();
+        $order=$orderService->getOrderDetail($orderId);
         $toUserId=$storeId;
         $messageContent=Common::format(DescribeConst::recieveWaitContent,$orderSn);
         $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);

application/models/Business/Order/OrderService.php

@@ -786,7 +786,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $delivery['mobPhone'] = $delivery['mobPhone'] ? $delivery['mobPhone'] : '';
                 $delivery['finishTime'] = $delivery['finishTime'] ? $delivery['finishTime'] : ApiConst::zero;
                 $delivery['orderGoods'] = !empty($goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']))?$goodsDao->convert($orderMerge[$value['orderId']]['orderGoods']):array();
-                $delivery['street'] = $delivery['reciverInfo']['address'];
+                $delivery['street'] =$orderCommonDao->convertReceiveAddress($delivery['reciverInfo']['address']);
                 $delivery['lng'] = $delivery['reciverInfo']['lng'] ? $delivery['reciverInfo']['lng'] : 0.0;
                 $delivery['lat'] = $delivery['reciverInfo']['lat'] ? $delivery['reciverInfo']['lat'] : 0.0;
                 $delivery['subAddress'] = isset($delivery['reciverInfo']['sub_address']) ? $delivery['reciverInfo']['sub_address'] : '';
@@ -868,7 +868,7 @@ class OrderServiceModel extends \Business\AbstractModel
             'getTime' => $delivery['getTime'],
             'reciverName' => $this->orderCommon['reciverName'],
             'mobPhone' => $reciverInfo['mob_phone'],
-            'street' => $reciverInfo['address'],
+            'street' =>$orderCommonDao->convertReceiveAddress($reciverInfo['address']),
             'lng' => isset($reciverInfo['lng']) ? $reciverInfo['lng'] : ApiConst::zero,
             'lat' => isset($reciverInfo['lat']) ? $reciverInfo['lat'] : ApiConst::zero,
             'subAddress' => isset($reciverInfo['sub_address'])?$reciverInfo['sub_address']:'',

application/models/DAO/Order/OrderCommon.php

@@ -78,6 +78,12 @@ class OrderCommonModel extends \DAO\AbstractModel
         return \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getAllByOrderIds'), array($orderIds, $field), ApiConst::oneDaySecond, array($deliveryId));
     }
 
+
+    public function convertReceiveAddress($address){
+        $search = array(" ","　","\n","\r","\t");
+        $replace = array("","","","","");
+        return str_replace($search, $replace, $address);
+    }
     public function insert($data)
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);