发货流程完善

biz/order/classes/OrderSendClass.php

@@ -54,11 +54,30 @@ class OrderSendClass extends BaseClass
 	}
 	
 	//免发货流程的处理 shish 2020.3.12
+	
+	/**
+	 * @param $id
+	 * @author shish <shish@zhhinc.com>
+	 * @time ${DATE} ${TIME}
+	 */
 	public static function withoutSend($id)
 	{
 		$actionList = self::$action;
 		$time = time();
+		
+		$hasAction = self::getAllByCondition(['orderId' => $id], null, '*', 'actionId');
+		
 		foreach ($actionList as $actionId => $action) {
+			if (isset($hasAction[$actionId])) {
+				//动作已经执行完成的不再执行
+				if (isset($hasAction[$actionId]['finishTime']) && !empty($hasAction[$actionId]['finishTime'])) {
+					continue;
+				}
+				//动作还未完成的操作完成
+				self::updateByCondition(['orderId' => $id], ['finishTime' => $time]);
+				continue;
+			}
+			//增加未完成的动作
 			$inTurn = $action['inTurn'];
 			$data = ['actionId' => $actionId, 'orderId' => $id, 'finishTime' => $time, 'addTime' => $time, 'inTurn' => $actionId];
 			self::add($data);