pc

application/controllers/Message.php

@@ -97,7 +97,7 @@ class MessageController extends \Our\Controller_AbstractApi {
         if($button['type']==\Our\ApiConst::messageButtonTypeConfirmButton){
             $orderService=  \Business\Order\OrderServiceModel::getInstance();
             $this->message=\Our\DescribeConst::confirmOrderSuccess;
-            return $orderService->confirmRecieve($this->memberId,$button['params']['orderId']);
+            return $orderService->confirmRecieve($button['params']['orderId'],$this->memberId);
         }
         \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
     }
@@ -117,7 +117,7 @@ class MessageController extends \Our\Controller_AbstractApi {
         }
         $res=$this->getServiceUpdate($res);
         if($res!==false){
-            $this->success('接单成功',$this->message);
+            $this->success($this->message,$this->message);
         }else{
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::receiveError);
         }

application/library/Our/DescribeConst.php

@@ -148,8 +148,8 @@ class DescribeConst
     const refundRetund='退货';
 
     //用户订单送达消息
-    const reacheRemindTitle='你的订单已经送达';
-    const reacheRemindContent='你有新的订单号为{0}的订单已经送达';
+    const reacheRemindTitle='你的订单卖家已经发货';
+    const reacheRemindContent='你有新的订单号为{0}的订单已经发货';
 
     //店铺有新订单
     const recieveWaitTitle='你有新的定单';

scripts/crontab/order/pushWaitComfirm.php

 <?php
 
 /**
- * 推送接单消息到店铺
  * 推送确认收货消息到用户
  * 执行时间：每分钟执行一次
  *

scripts/crontab/push/jpush.php

@@ -45,9 +45,10 @@ class cliOrderClose extends basecli
         $redis = new \Redis();
         $redis->pconnect($conf['host'], $conf['port']);
         $clientPush=\JPush\ClientPush::getInstance();
+        $messageService=\DAO\MessageHistoryModel::getInstance();
         while($pushData=$redis->lPop('push_center')){
             $addData = unserialize($pushData);
-            $addData['message'] = unserialize($addData['message']);
+            $addData['message'] = $messageService->convertMessage($addData['message']);
             $clientPush->push($addData);
         }
     }