配送单显示

biz/order/services/OrderSendService.php

@@ -65,7 +65,7 @@ class OrderSendService extends BaseService
 		$time = time();
 		
 		$sendType = isset($data['sendType']) ? $data['sendType'] : OrderClass::SEND_TYPE_UNKNOWN;
-
+		
 		$sendInfo = [];
 		if ($sendType == OrderClass::SEND_TYPE_OTHER) {
 			$side = $data['sendSide'];
@@ -88,10 +88,17 @@ class OrderSendService extends BaseService
 			];
 			OrderExpressClass::add($sendInfo);
 		}
-		
+
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $deliverId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType]);
-		
+		$hasDeliver = 0;
+		if ($option == 1) {
+			$hasDeliver = 1;
+		}
+		if ($option == 2) {
+			$hasDeliver = 2;
+		}
+		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType, 'hasDeliver' => $hasDeliver]);
+
 		//进入送达流程
 		$reachId = $actionIdList['reach'];
 		$data = ['actionId' => $reachId, 'orderId' => $id, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $reachId];

console/controllers/UpgradeController.php

@@ -1282,7 +1282,9 @@ distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 		
 		$sql = "ALTER TABLE `xhOrderExpress` ADD `status` TINYINT NOT NULL DEFAULT 0 COMMENT '0待接单 1已接单 2已完成 3已取消' AFTER `sendTime`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
+		$sql = "ALTER TABLE `xhOrder` ADD `hasDeliver` TINYINT NOT NULL DEFAULT 0 COMMENT '0未确认 1有手写配送单 2填电子单' AFTER `sendStatus`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
 	}
 	
 	//数据迁移 shish 2020.1.12