订单流程优化

app/business/controllers/OrderController.php

@@ -157,7 +157,7 @@ class OrderController extends BaseController
 	}
 	
 	//配送单 shish 2020.2.29
-	public function actionDeliver()
+	public function actionGetDeliverDetail()
 	{
 		$id = Yii::$app->request->get('id', 0);
 		$order = OrderService::getById($id);

biz/order/services/OrderSendService.php

@@ -34,14 +34,14 @@ class OrderSendService extends BaseService
 		if ($printOrderId != $currentId) {
 			util::fail('当前流程无法操作');
 		}
-		//1有配送单 2 填单并打单
+		//1有配送单 2 填单打单
 		if (in_array($option, [1, 2]) == false) {
 			util::fail('操作无效');
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $printOrderId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'currentFlow' => 2]);
-		
+		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'currentFlow' => 2, 'printStatus' => 1]);
+
 		//进入发货流程
 		$deliverId = $actionIdList['deliver'];
 		$data = ['actionId' => $deliverId, 'orderId' => $id, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $deliverId];

biz/order/services/OrderService.php

@@ -155,12 +155,13 @@ class OrderService extends BaseService
 	public static function updateSheet($order, $data)
 	{
 		$id = $order['id'];
-		if (in_array($order['status'], [0, 1]) == false) {
-			util::fail('订单当前状态不是待配送，不能修改');
+		if ($order['status'] != OrderClass::ORDER_STATUS_UN_SEND) {
+			util::fail('订单当前不是待配送状态');
 		}
+		$data['deliver'] = 1;
 		OrderClass::updateById($id, $data);
 	}
-	
+
 	//订单详情 shish 2020.1.2
 	public static function getOrderById($id)
 	{

console/controllers/UpgradeController.php

@@ -1277,6 +1277,9 @@ distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 		$sql = "ALTER TABLE `xhOrderExpress` CHANGE `side` `sideId` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方id';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
+		$sql = "ALTER TABLE `xhOrder` ADD `deliver` TINYINT NOT NULL DEFAULT 0 COMMENT '0没有配送单 1有' AFTER `shopId`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
 	
 	//数据迁移 shish 2020.1.12