ordergoods

application/library/Our/Push.php

@@ -169,14 +169,20 @@ class Push
         $this->pushMessage($id,$this->orderId,$toId,$this->orderId,$toUserId,$this->orderName,$member['memberName'],ApiConst::orderMessageType,ApiConst::memberMessageType,$fromAvatar,$message);
     }
     //配送提醒
-    public function deliveryRemind($toId,$orderId)
+    public function deliveryRemind($toId,$orderId,$orderGoodsId=false)
     {
         $memberDao = \DAO\MemberModel::getInstance();
         $member = $memberDao->getInfo($toId);
+
         $toId=$toId;
         $toUserId=$toId;
         $orderService=\Business\Order\OrderServiceModel::getInstance();
         $orderDetail=$orderService->getOrderDetail($orderId);
+        if($orderGoodsId){
+            $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance();
+            $orderDetail['orderGoods']= $orderGoodsDao->convertRefundOrderGoods($orderDetail['orderGoods']);
+        }
+
         $messageContent=$this->getOrderMessageContent($orderDetail);
         $href=Common::format(PathConst::orderId,$orderId);
         $fromAvatar=Common::getStaticFile(ImageConst::orderAvatarName, ImageConst::systemAvatar);
@@ -185,8 +191,8 @@ class Push
         $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);
     }
-    public function sendDelivery($toId,$orderId){
-        $this->deliveryRemind($toId,$orderId);
+    public function sendDelivery($toId,$orderId,$orderGoodsId=false){
+        $this->deliveryRemind($toId,$orderId,$orderGoodsId);
         $this->sendTcpMessage();
     }
     private function getButton($buttonType,$name,$buttonId,$params){

application/models/Business/Store/DeliveryService.php

@@ -45,7 +45,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
             $orderD= $orderDao->find($whereOrder,$orderDao->getOrderDetailField());
         }else{
             $whereOrder['order_id']=$data['orderId'];
-            $orderD= $orderDao->find($data['orderId'],$orderDao->getOrderDetailField());
+            $orderD= $orderDao->find($whereOrder,$orderDao->getOrderDetailField());
         }
 
 //        if( $orderD['diliveryman_id']== $data['id']){
@@ -105,7 +105,12 @@ class DeliveryServiceModel extends \Business\AbstractModel
         $storeDao->deleteStoreRefundCache($data['storeId'],$data['orderId']);
         //配送员推送
         $push=\Our\Push::getInstance();
+        if($data['orderType']==ApiConst::orderTypeRefund){
+            $push->sendDelivery($oringeDeliveryManMemberId,$orderD['orderId'],$orderOne['orderGoodsId']);
+        }else{
             $push->sendDelivery($oringeDeliveryManMemberId,$orderD['orderId']);
+        }
+
         $messageService->addMessageCenterToDb();
         return $res;
     }

application/models/DAO/Order/OrderGoods.php

@@ -259,6 +259,15 @@ class OrderGoodsModel extends \DAO\AbstractModel {
         return $res;
 
     }
+    public function convertRefundOrderGoods($orderGoods,$orderGoodsId){
+        $newOrderGoods=Array();
+        foreach($orderGoods as $orderGood){
+            if($orderGood['recId']==$orderGoodsId){
+                array_push($newOrderGoods,$orderGood);
+            }
+        }
+        return $newOrderGoods;
+    }
     /**
      * 类实例
      *