发货优化

biz/order/services/OrderSendService.php

@@ -45,7 +45,7 @@ class OrderSendService extends BaseService
 			$hasDeliver = 2;
 		}
 		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'currentFlow' => 2, 'printStatus' => 1, 'hasDeliver' => $hasDeliver]);
-
+		
 		//进入发货流程
 		$deliverId = $actionIdList['deliver'];
 		$data = ['actionId' => $deliverId, 'orderId' => $id, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $deliverId];
@@ -67,11 +67,14 @@ class OrderSendService extends BaseService
 			util::fail('当前流程无法操作');
 		}
 		$time = time();
-		
+
 		$sendType = isset($data['sendType']) ? $data['sendType'] : OrderClass::SEND_TYPE_UNKNOWN;
-		
+
 		$sendInfo = [];
 		if ($sendType == OrderClass::SEND_TYPE_OTHER) {
+
+			util::fail('即将开通...');
+
 			$side = $data['sendSide'];
 			$sendTime = strtotime(date("Y-m-d") . ' ' . $data['sendTime']);
 			if ($sendTime < ($time + 20 * 60)) {
@@ -95,14 +98,14 @@ class OrderSendService extends BaseService
 		
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $deliverId], ['option' => $option, 'finishTime' => $time]);
 		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType]);
-
-        //待发货订单-1，配送中订单+1
-        $merchantId = $data['merchantId'];
-        $asset = MerchantAssetClass::getByMerchantId($merchantId, true);
-        $asset->unSendOrder -= 1;
-        $asset->sendingOrder += 1;
-        $asset->save();
-
+		
+		//待发货订单-1，配送中订单+1
+		$merchantId = $data['merchantId'];
+		$asset = MerchantAssetClass::getByMerchantId($merchantId, true);
+		$asset->unSendOrder -= 1;
+		$asset->sendingOrder += 1;
+		$asset->save();
+		
 		//进入送达流程
 		$reachId = $actionIdList['reach'];
 		$data = ['actionId' => $reachId, 'orderId' => $id, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $reachId];
@@ -130,14 +133,14 @@ class OrderSendService extends BaseService
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
 		OrderClass::complete($order);
-
-        //配送中订单-1，完成订单+1
-        $merchantId = $order['merchantId'];
-        $asset = MerchantAssetClass::getByMerchantId($merchantId, true);
-        $asset->sendingOrder -= 1;
-        $asset->finishOrder += 1;
-        $asset->save();
-
+		
+		//配送中订单-1，完成订单+1
+		$merchantId = $order['merchantId'];
+		$asset = MerchantAssetClass::getByMerchantId($merchantId, true);
+		$asset->sendingOrder -= 1;
+		$asset->finishOrder += 1;
+		$asset->save();
+		
 		util::complete();
 	}