jpush

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='你有新的定单';

application/models/Business/Order/OrderService.php

@@ -447,7 +447,12 @@ class OrderServiceModel extends \Business\AbstractModel
         do {
             $orders = $orderDao->getRecieveOrders(ApiConst::orderStateWaitRecieve, $addTime, $pageBegin, PageConst::taskPageSize, 'send_time');
             foreach ($orders['list'] as $order) {
-                $push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']);
+                if($order['shippingType']==ApiConst::bySelf){
+                    $push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']);
+                }
+                if($order['shippingType']!=ApiConst::bySelf && $order['shippingOver']==ApiConst::shippingOver){
+                    $push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']);
+                }
             }
             $pageBegin++;
         } while (!empty($orders['list']));