pc

application/models/Business/Order/OrderService.php

@@ -575,6 +575,22 @@ class OrderServiceModel extends \Business\AbstractModel
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
         $order = $orderDao->findByOrderId($orderId,$orderDao->getOrderDetailField());
+        $waitReceiveCount=ApiConst::zero;
+        $waitDeliveryCount=ApiConst::zero;
+        $waitGetCount=ApiConst::zero;
+        if(in_array($order['orderState'],array(ApiConst::orderStateWaitSendOne,ApiConst::orderStateWaitRecieve))){
+            if($order['shippingType']==ApiConst::bySelf){
+                $waitGetCount=ApiConst::reduceOne;
+            }
+            if($order['shippingType']==ApiConst::bySeller){
+                $waitDeliveryCount=ApiConst::reduceOne;
+            }
+        }
+        if($order['orderState']==ApiConst::orderStateWaitConfirm){
+            $waitReceiveCount=-1;
+        }
+
+
         $storeDao=\DAO\StoreModel::getInstance();
         //判断订单目前状态是否允许取消
         $isAllowCancel = $orderDao->isAllowCancel($order);
@@ -607,9 +623,9 @@ class OrderServiceModel extends \Business\AbstractModel
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order['storeId'],
                     'type'=>ApiConst::messageWaitReceive,
-                    'waitReceiveCount'=>ApiConst::reduceOne,
-                    'waitDeliveryCount'=>ApiConst::zero,
-                    'waitGetCount'=>ApiConst::zero,
+                    'waitReceiveCount'=>$waitReceiveCount,
+                    'waitDeliveryCount'=>$waitDeliveryCount,
+                    'waitGetCount'=>$waitGetCount,
                     'orderCount'=>ApiConst::reduceOne,
                     'waitRefundProccessCount'=>ApiConst::zero,
                     'waitRefundReceiveCount'=>ApiConst::zero,