消息问题

application/library/Our/ApiConst.php

@@ -94,6 +94,8 @@ class ApiConst
     const storeMessageType = 4;
     //普通用户消息类型
     const memberMessageType = 5;
+
+    const diliveryMessageOrder=9;
     //配送员用户消息类型
     //快递消息
     const deliveryUserMessageType = 8;

application/library/Our/Push.php

@@ -188,7 +188,7 @@ class Push
         // $buttons=$this->getRecieveButtons($orderId);
         $message=$this->getMessageTemplate(ApiConst::deliveryOrderType,DescribeConst::deliveryRemindTitle,$messageContent,'','',$href,ApiConst::zero);
         $id = time() . (string)$this->orderIdStr.$orderId;
-        $this->pushMessage($id,\Our\MemberIdConst::deliveryId,$toId,\Our\MemberIdConst::deliveryId,$toUserId,\Our\MemberIdConst::deliveryMessageName,$member['memberName'],ApiConst::orderMessageType,ApiConst::deliveryUserMessageType,$fromAvatar,$message);
+        $this->pushMessage($id,\Our\MemberIdConst::deliveryId,$toId,\Our\MemberIdConst::deliveryId,$toUserId,\Our\MemberIdConst::deliveryMessageName,$member['memberName'],ApiConst::diliveryMessageOrder,ApiConst::deliveryUserMessageType,$fromAvatar,$message);
     }
     public function sendDelivery($toId,$orderId,$orderGoodsId=false){
         $this->deliveryRemind($toId,$orderId,$orderGoodsId);

application/models/Business/Message/MessageService.php

@@ -222,7 +222,7 @@ class MessageServiceModel extends \Business\AbstractModel
             $member['uid'] = $store['store_id'];
             $member['name'] = $store['store_name'];
         }
-        if ($type == ApiConst::memberMessageType || $type == ApiConst::serviceMessageType) {
+        if ($type == ApiConst::memberMessageType || $type == ApiConst::serviceMessageType ||$type==ApiConst::diliveryMessageOrder || $type==ApiConst::deliveryOrderType) {
             $memberDao = \DAO\MemberModel::getInstance();
             $member = $memberDao->getOneByMemberId($memberId, 'member_id,member_name');
             $member['uid'] = $member['member_id'];