订单流程优化

biz/order/classes/OrderClass.php

@@ -52,6 +52,7 @@ class OrderClass extends BaseClass
 		//将花店每月的总订单数作为编号
 		//$data['sendNum'] = (string)$monthReturn['riseNum'];
 		$data['sendNum'] = 0;
+		$data['totalFlow'] = OrderSendClass::TOTAL_FLOW;
 		$return = self::add($data);
 		return $return;
 	}
@@ -123,7 +124,7 @@ class OrderClass extends BaseClass
 	{
 		self::updateById($id, ['status' => self::ORDER_STATUS_COMPLETE]);
 	}
-
+	
 	//转化出送到时间 shish 2020.3.15
 	public static function getReachTime($order)
 	{
@@ -137,5 +138,5 @@ class OrderClass extends BaseClass
 		}
 		return $reachTime;
 	}
-
+	
 }

biz/order/classes/OrderSendClass.php

@@ -23,7 +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)
 	{

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,'currentFlow'=>2]);
+		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,'currentFlow'=>3]);
+		OrderClass::updateById($id, ['status' => 2, 'currentFlow' => 3]);
 		
 		$sendType = isset($data['sendType']) ? $data['sendType'] : 1;
 		//使用快递
@@ -111,15 +111,9 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 5,'currentFlow'=>5]);
-		
-		//进入完成流程
-		$finishId = $actionIdList['finish'];
-		$data = ['actionId' => $finishId, 'orderId' => $id, 'finishTime' => $time, 'addTime' => $time, 'inTurn' => $finishId];
-		OrderSendClass::add($data);
-		$actionList = OrderSendClass::$action;
-		$data['actionSign'] = isset($actionList[$finishId]['sign']) ? $actionList[$finishId]['sign'] : '';
-		util::success(['nextAction' => $data]);
+		OrderClass::updateById($id, ['status' => 5, 'currentFlow' => 4]);
+
+		util::complete();
 	}
 	
 	//发货详情 shish 2019.12.15

console/controllers/UpgradeController.php

@@ -1245,6 +1245,9 @@ UPDATE `xhMerchantExtend` SET `freeDistance`=5;";
 		$sql = "ALTER TABLE `xhOrder` ADD inform TINYINT NOT NULL DEFAULT 0 COMMENT '通知 0待通知 1通知成功 2通知失败' AFTER `sendStatus`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
+		$sql = "ALTER TABLE `xhOrder` MODIFY `sendType` TINYINT NOT NULL DEFAULT 0 COMMENT '0未确认配送方式 1免配送 2自己送 3别人送；快递送';";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
 
 	//数据迁移 shish 2020.1.12