通知

biz/order/classes/OrderSendClass.php

@@ -35,7 +35,9 @@ class OrderSendClass extends BaseClass
 		$time = time();
 		$data = ['actionId' => $placeOrderId, 'orderId' => $orderId, 'finishTime' => $payTime, 'addTime' => $time, 'inTurn' => $placeOrderId];
 		self::add($data);
-		
+
+		OrderClass::updateById($orderId, ['currentFlow' => 1]);
+
 		//打单未开始
 		$printOrderId = $actionId['printOrder'];
 		$data = ['actionId' => $printOrderId, 'orderId' => $orderId, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $printOrderId];
@@ -54,12 +56,6 @@ class OrderSendClass extends BaseClass
 	}
 	
 	//免发货流程的处理 shish 2020.3.12
-	
-	/**
-	 * @param $id
-	 * @author shish <shish@zhhinc.com>
-	 * @time ${DATE} ${TIME}
-	 */
 	public static function withoutSend($order)
 	{
 		$id = $order['id'];

biz/order/services/OrderSendService.php

@@ -39,7 +39,7 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $printOrderId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 1]);
+		OrderClass::updateById($id, ['status' => 1,'currentFlow'=>2]);
 		
 		//进入发货流程
 		$deliverId = $actionIdList['deliver'];
@@ -67,7 +67,7 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $deliverId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 2]);
+		OrderClass::updateById($id, ['status' => 2,'currentFlow'=>3]);
 		
 		$sendType = isset($data['sendType']) ? $data['sendType'] : 1;
 		//使用快递
@@ -111,7 +111,7 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 5]);
+		OrderClass::updateById($id, ['status' => 5,'currentFlow'=>5]);
 		
 		//进入完成流程
 		$finishId = $actionIdList['finish'];