发货管理

app-hd/controllers/OrderSendController.php

@@ -41,7 +41,7 @@ class OrderSendController extends BaseController
         OrderService::valid($order, $this->shopId);
         $post['merchantId'] = $this->sjId;
         $post['orderSn'] = $order['orderSn'];
-        OrderSendService::deliver($post);
+        OrderSendService::deliver($post,$order);
     }
 
     //送达 ssh 2019.12.17

biz-hd/order/services/OrderSendService.php

@@ -58,7 +58,7 @@ class OrderSendService extends BaseService
     }
 
     //发货 ssh 2019.12.17
-    public static function deliver($data)
+    public static function deliver($data,$order)
     {
         $id = $data['id'];
         $orderSn = $data['orderSn'];
@@ -75,9 +75,8 @@ class OrderSendService extends BaseService
 
         $sendInfo = [];
         if ($sendType == OrderClass::SEND_TYPE_THIRD) {
-
+            //快递送
             util::fail('即将开通...');
-
             $side = $data['expressId'];
             $sendTime = date("Y-m-d") . ' ' . $data['sendTime'];
             if (strtotime($sendTime) < ($time + 20 * 60)) {
@@ -103,7 +102,7 @@ class OrderSendService extends BaseService
         OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType]);
 
         //待发货订单-1，配送中订单+1
-        $shopId = $data['shopId'];
+        $shopId = $order['shopId'] ?? 0;
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
         if (empty($shop)) {
             util::fail('没有找到门店');
@@ -137,7 +136,7 @@ class OrderSendService extends BaseService
         OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => OrderClass::ORDER_TOTAL_FLOW]);
 
         //配送中订单-1，完成订单+1
-        $shopId = $order['shopId'];
+        $shopId = $order['shopId'] ?? 0;
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
         $shop->sendingOrder -= 1;
         $shop->finishOrder += 1;