pc

application/library/Our/Push.php

@@ -107,7 +107,6 @@ class Push
             $convert['toUserName'] = $data['buyerName'];
             $convert['toType'] = ApiConst::memberMessageType;
             $convert['message'] = ArrayConst::orderCloseTemplate;
-            $convert['message']['content']=Common::format( $convert['message']['content'],$data['orderId']);
             $convert['message']['href'] = "orderId=" . $data['orderId'];
             $convert['message']['content']=Common::format($convert['message']['content'],$data['orderSn']);
             $convert['message'] = serialize($convert['message']);
@@ -192,7 +191,6 @@ class Push
 
     }
     public function getOrderMessageContent($orderDetail){
-
         $messageContent='商品名称:';
         foreach($orderDetail['orderGoods'] as $orderGood){
             $messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n";
@@ -201,7 +199,7 @@ class Push
         $messageContent.='付款状态:'.ArrayConst::paymentTypes[$orderDetail['paymentTime']]>ApiConst::zero?DescribeConst::payed:DescribeConst::notPayed."\n";
         $messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n";
         $messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n";
-        $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['telPhone']."\n";
+        $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n";
         return $messageContent;
 
     }

application/models/Business/Order/OrderService.php

@@ -282,6 +282,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $returnData['storeMemberId']=$this->store['memberId'];
         $returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
         $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
+        $this->address['address']=$orderCommonDao->convertReceiveAddress($this->address['address']);
         $returnData['reciverInfo'] = $this->address;
         $returnData['reciverInfo']['lng']=!empty($returnData['reciverInfo']['lng'])?$returnData['reciverInfo']['lng']:ApiConst::zero;
         $returnData['reciverInfo']['lat']=!empty($returnData['reciverInfo']['lat'])?$returnData['reciverInfo']['lat']:ApiConst::zero;