免配送

biz/order/classes/OrderSendClass.php

@@ -23,10 +23,10 @@ class OrderSendClass extends BaseClass
 		40 => ['name' => '送达', 'sign' => 'reach'],
 		50 => ['name' => '完成', 'sign' => 'finish'],
 	];
-
+	
 	//总流程数
 	const TOTAL_FLOW = 4;
-
+	
 	//下单操作完成 shish 2019.12.13
 	public static function placeOrder($data)
 	{
@@ -38,9 +38,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];
@@ -63,30 +63,12 @@ class OrderSendClass extends BaseClass
 	{
 		$id = $order['id'];
 		if ($order['status'] == OrderClass::ORDER_STATUS_COMPLETE) {
-			util::fail('已完成订单');
+			util::fail('订单已完成');
 		}
-
 		self::deleteByCondition(['orderId' => $id]);
-
 		//订单状态变更
-		OrderClass::updateById($id, ['sendType' => 0, 'totalFlow' => OrderClass::ORDER_TOTAL_FLOW, 'currentFlow' => OrderClass::ORDER_TOTAL_FLOW]);
+		OrderClass::updateById($id, ['sendType' => 1, 'totalFlow' => OrderClass::ORDER_TOTAL_FLOW, 'currentFlow' => OrderClass::ORDER_TOTAL_FLOW]);
 		OrderClass::complete($order);
-
-//		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;
 	}