返回当前的流程数

app/business/controllers/OrderController.php

@@ -127,10 +127,8 @@ class OrderController extends BaseController
 		$order = OrderService::getById($id);
 		OrderService::valid($order, $this->merchantId);
 		//配送流程变更
-		OrderSendClass::withoutSend($id);
-		//订单状态变更
-		OrderClass::complete($id);
-		util::complete('操作成功');
+		$currentFlow = OrderSendClass::withoutSend($order);
+		util::success(['currentFlow' => $currentFlow]);
 	}
 	
 	//修改价格 shish 2020.1.6

biz/order/classes/OrderClass.php

@@ -25,6 +25,8 @@ class OrderClass extends BaseClass
 	const ORDER_STATUS_UN_SEND = 1;
 	//待付款
 	const ORDER_STATUS_UN_PAY = 0;
+	//订单总流程数
+	const ORDER_TOTAL_FLOW = 5;
 
 	//添加订单 shish 2019.12.5
 	public static function addOrder($data)
@@ -110,11 +112,11 @@ class OrderClass extends BaseClass
 		}
 		return $rand / 10;
 	}
-
+	
 	//订单完成 shish 2020.3.12
 	public static function complete($id)
 	{
 		self::updateById($id, ['status' => self::ORDER_STATUS_COMPLETE]);
 	}
-
+	
 }

biz/order/classes/OrderSendClass.php

@@ -60,28 +60,35 @@ class OrderSendClass extends BaseClass
 	 * @author shish <shish@zhhinc.com>
 	 * @time ${DATE} ${TIME}
 	 */
-	public static function withoutSend($id)
+	public static function withoutSend($order)
 	{
-		$actionList = self::$action;
-		$time = time();
+		$id = $order['id'];
+		if ($order['status'] == OrderClass::ORDER_STATUS_COMPLETE) {
+			util::fail('已完成订单');
+		}
 		
-		$hasAction = self::getAllByCondition(['orderId' => $id], null, '*', 'actionId');
+		self::deleteByCondition(['orderId' => $id]);
 		
-		foreach ($actionList as $actionId => $action) {
-			if (isset($hasAction[$actionId])) {
-				//动作已经执行完成的不再执行
-				if (isset($hasAction[$actionId]['finishTime']) && !empty($hasAction[$actionId]['finishTime'])) {
-					continue;
-				}
-				//动作还未完成的操作完成
-				self::updateByCondition(['orderId' => $id, 'actionId' => $actionId], ['finishTime' => $time]);
-				continue;
-			}
-			//增加未完成的动作
-			$inTurn = $action['inTurn'];
-			$data = ['actionId' => $actionId, 'orderId' => $id, 'finishTime' => $time, 'addTime' => $time, 'inTurn' => $actionId];
-			self::add($data);
-		}
-	}
+		//订单状态变更
+		OrderClass::updateById($id, ['sendType' => 0, 'totalFlow' => OrderClass::ORDER_TOTAL_FLOW, 'currentFlow' => OrderClass::ORDER_TOTAL_FLOW]);
+		OrderClass::complete($id);
 
+//		foreach ($actionList as $actionId => $action) {
+//			if (isset($hasAction[$actionId])) {
+//				//动作已经执行完成的不再执行
+//				if (isset($hasAction[$actionId]['finishTime']) && !empty($hasAction[$actionId]['finishTime'])) {
+//					continue;
+//				}
+//				//动作还未完成的操作完成
+//				self::updateByCondition(['orderId' => $id, 'actionId' => $actionId], ['finishTime' => $time]);
+//				continue;
+//			}
+//			//增加未完成的动作
+//			$inTurn = $action['inTurn'];
+//			$data = ['actionId' => $actionId, 'orderId' => $id, 'finishTime' => $time, 'addTime' => $time, 'inTurn' => $actionId];
+//			self::add($data);
+//		}
+		return OrderClass::ORDER_TOTAL_FLOW;
+	}
+	
 }