pc

application/controllers/Message.php

@@ -148,6 +148,7 @@ class MessageController extends \Our\Controller_AbstractApi {
         }
         \Error\ErrorModel::throwException(\Error\CodeConfigModel::setMessageFail);
     }
+
     public function getSetAction(){
         $memberCenterService=\Business\User\MemberCenterServiceModel::getInstance();
         $messageSet=$memberCenterService->getMessageSet($this->memberId);

application/library/Our/ArrayConst.php

@@ -37,6 +37,14 @@ class ArrayConst
         ApiConst::qqPayType,
         ApiConst::wxLitePayType
     );
+    const paymentTypes=array(
+        ApiConst::offlinePay=>'线下付款',
+        ApiConst::wxpay=>'微信付款',
+        ApiConst::afterSendPay=>'货到付款',
+        ApiConst::alipay=>'支付宝付款',
+        ApiConst::tenpay=>'qq支付',
+        ApiConst::wxProgram=>'微信付款',
+    );
     const orderPayTypeOnlines=array(
         ApiConst::wxpay,
         ApiConst::alipay,

application/library/Our/DescribeConst.php

@@ -143,7 +143,8 @@ class DescribeConst
     const payOnlineName = '线上支付'; //线上支付
     const payOfflineName = '线下支付'; //线下支付
     const payAogName = '货到付款'; //货到付款
-
+    const payed = '已付款'; //货到付款
+    const notPayed = '未付款'; //货到付款
     const refund='退款';
     const refundRetund='退货';
 

application/library/Our/Push.php

@@ -190,6 +190,20 @@ class Push
           array_push($buttons,$button);
           return $buttons;
 
+    }
+    public function getOrderMessageContent($orderDetail){
+
+        $messageContent='商品名称:';
+        foreach($orderDetail['orderGoods'] as $orderGood){
+            $messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n";
+        }
+        $messageContent.='支付方式:'.ArrayConst::paymentTypes[$orderDetail['paymentType']]."\n";
+        $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";
+        return $messageContent;
+
     }
     //店铺接单
     public function recieveWait($storeId,$orderId,$orderSn)
@@ -199,9 +213,9 @@ class Push
         $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfo'), array($condition), ApiConst::oneDaySecond, array($storeId));
         //$store = $storeDao->getInfo(array('store_id'=>$storeId));
         $orderService=\Business\Order\OrderServiceModel::getInstance();
-        $order=$orderService->getOrderDetail($orderId);
+        $orderDetail=$orderService->getOrderDetail($orderId);
         $toUserId=$storeId;
-        $messageContent=Common::format(DescribeConst::recieveWaitContent,$orderSn);
+        $messageContent=$this->getOrderMessageContent($orderDetail);
         $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
         $href=Common::format(PathConst::orderId,$orderId);
         $buttons=$this->getComfirmRecieveButtons($orderId);