订单流程

biz/order/services/OrderSendService.php

@@ -70,8 +70,8 @@ class OrderSendService extends BaseService
 		if ($sendType == OrderClass::SEND_TYPE_OTHER) {
 			$side = $data['sendSide'];
 			$sendTime = strtotime(date("Y-m-d") . ' ' . $data['sendTime']);
-			if ($sendTime < ($time + 30 * 60)) {
-				util::fail('请选择30分钟之后的时间');
+			if ($sendTime < ($time + 20 * 60)) {
+				util::fail('请选择20分钟之后的时间');
 			}
 			$sendInfo = [
 				'sideId' => $side,

console/controllers/UpgradeController.php

@@ -1279,6 +1279,9 @@ distance DECIMAL(6,1) NOT NULL DEFAULT 0.0 COMMENT '距离',
 
 		$sql = "ALTER TABLE `xhOrder` ADD `deliver` TINYINT NOT NULL DEFAULT 0 COMMENT '0没有配送单 1有' AFTER `shopId`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
+		
+		$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);
 
 	}