pc

application/library/Our/DescribeConst.php

@@ -164,10 +164,12 @@ class DescribeConst
     //店铺有新订单
     const recieveWaitTitle='您有新的订单';
     const recieveWaitContent='您有新的订单号为{0}的订单，是否需要接单';
-    //用户订单被接单
+     //用户订单被接单
     const recieveOrderTitle='您的订单已被接单';
     const recieveOrderContent='您有订单号为{0}的订单，已被接单';
-
+    //用户订单价格被修改
+    const updateOrderTitle='您的订单已被修改';
+    const updateOrderContent='您有订单号为{0}的订单，已被修改价格';
     //消息按钮成功提示信息
     const recieveOrderSuccess='接单成功';
     //消息按钮描述

application/library/Our/Push.php

@@ -234,21 +234,42 @@ class Push
         return $messageContent;
 
     }
-    //用户被接单消息
+    public function getUpdateOrderAmountContent($orderDetail){
+        $messageContent='订单号:'.$orderDetail['orderSn']."\n";
+        $messageContent.='商品名称:';
+        foreach($orderDetail['orderGoods'] as $orderGood){
+            $messageContent.=$orderGood['goodsName'].'×'.$orderGood['goodsNum']."\n";
+        }
+        $messageContent.='支付方式:'.ArrayConst::paymentTypes[$orderDetail['paymentType']]."\n";
+        $messageContent.='付款状态:'.($orderDetail['paymentTime']>ApiConst::zero?DescribeConst::payed:DescribeConst::notPayed)."\n";
+        $messageContent.='收货地址:'.$orderDetail['reciverInfo']['address']."\n";
+        $messageContent.='收货人:'.$orderDetail['reciverInfo']['trueName']."\n";
+        $messageContent.='收货人电话:'.$orderDetail['reciverInfo']['mobPhone']."\n";
+        $messageContent.='订单金额:'.$orderDetail['goodsAmount']."\n";
+        $messageContent.='运费:'.$orderDetail['shippingFee']."\n";
+        $messageContent.='优惠金额:'.$orderDetail['couponAmount']."\n";
+        $messageContent.='应付金额:'.$orderDetail['orderAmount']."\n";
+        return $messageContent;
+
+    }
+    //用户被修改价格消息
     public function updateOrderAmount($storeId,$orderId,$orderSn)
     {
         $storeDao=\DAO\StoreModel::getInstance();
+        $orderDao=\DAO\Order\OrderModel::getInstance();
         $condition['store_id'] = $storeId;
         $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();
         $orderDetail=$orderService->getOrderDetail($orderId);
+        $amountOrder=$orderDao->getClienOrderCommon($orderDetail);
+        $orderDetail=array_merge($orderDetail,$amountOrder);
         $toUserId=$orderDetail['buyerId'];
-        $messageContent=$this->getOrderMessageContent($orderDetail);
+        $messageContent=$this->getUpdateOrderAmountContent($orderDetail);
         $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
         $href=Common::format(PathConst::orderId,$orderId);
         // $buttons=$this->getComfirmRecieveButtons($orderId);
-        $message=$this->getMessageTemplate(ApiConst::reicieveOrderType,DescribeConst::recieveOrderTitle,$messageContent,'','',$href,ApiConst::zero);
+        $message=$this->getMessageTemplate(ApiConst::reicieveOrderType,DescribeConst::updateOrderTitle,$messageContent,'','',$href,ApiConst::zero);
         $id = time() . (string)$this->orderIdStr.$orderId;
         $this->pushMessage($id,$this->orderId,$orderDetail['buyerId'],$this->orderId,$toUserId,$this->orderName,$store['store_name'],ApiConst::orderMessageType,ApiConst::memberMessageType,$fromAvatar,$message);
     }

application/models/Business/Order/OrderService.php

@@ -984,7 +984,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
         $push=\Our\Push::getInstance();
-        $push->recievedOrder($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
+        $push->updateOrderAmount($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
         $push->sendTcpMessage();
         $orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true);
         $storeDao->deleteStoreCache($storeId,$orderId);