发货时间

app/business/controllers/OrderController.php

@@ -25,7 +25,6 @@ class OrderController extends BaseController
 	public function actionList()
 	{
 		$get = Yii::$app->request->get();
-		
 		//组建where
 		$status = isset($get['status']) ? $get['status'] : 0;
 		$search = isset($get['search']) ? $get['search'] : '';
@@ -41,48 +40,11 @@ class OrderController extends BaseController
 		$list = OrderService::getOrderList($where);
 		util::success($list);
 	}
-	
+
 	//发货管理 shish 2019.11.30
 	public function actionSend()
 	{
-		return [
-			'orderId' => '201911232278449',
-			'price' => '390',
-			'progress' => 4,
-			'list' => [
-				[
-					'name' => '下单',
-					'reach' => 1,
-					'time' => '11.20 12:30',
-					'show' => ['hint' => '已下单']
-				],
-				[
-					'name' => '打单',
-					'reach' => 1,
-					'time' => '11.20 12:30',
-					'show' => ['option' => 1, 'info' => ['收花人信息待写上'], 'hint' => '已确认'],
-				
-				],
-				[
-					'name' => '发货',
-					'reach' => 1,
-					'time' => '11.20 12:30',
-					'show' => ['option' => 0, 'info' => ['配送信息待写上'], 'hint' => '已确认'],
-				],
-				[
-					'name' => '送达',
-					'reach' => 1,
-					'time' => '11.20 12:30',
-					'show' => ['hint' => '已送达']
-				],
-				[
-					'name' => '完成',
-					'reach' => 1,
-					'time' => '11.20 12:30',
-					'show' => ['hint' => '订单已完成']
-				],
-			]
-		];
+
 	}
-	
+
 }

sql.txt

@@ -1,3 +1,8 @@
+2019.12.15 16:30 shish 数据要重新更新过去！！！！！
+ALTER TABLE xhOrder ADD `reachDate` DATE DEFAULT NULL COMMENT '客户要求送到的日期' AFTER `sendDistance`;
+ALTER TABLE xhOrder DROP COLUMN `reachTime`;
+ALTER TABLE xhOrder MODIFY `reachPeriod` TINYINT NOT NULL DEFAULT 0 COMMENT '客户要求送到的时段：0上午1下午2晚上';
+
 2019.12.15 11:57 刮刮卡表名变更
 RENAME TABLE xhGuaGua TO xhGgk;
 RENAME TABLE xhGuaGuaAttend TO xhGgkAttend;
@@ -5,6 +10,14 @@ RENAME TABLE xhGuaGuaPrize TO xhGgkPrize;
 RENAME TABLE xhGuaGuaWin TO xhGgkWin;
 ALTER TABLE xhOrder CHANGE `modPriceStatus` `modPrice` TINYINT NOT NULL DEFAULT 1 COMMENT '0不能修改价格 1可以修改';
 ALTER TABLE xhOrder DROP COLUMN `getCouponQrCode`;
+alter table xhOrder AUTO_INCREMENT=263810;
+ALTER TABLE xhOrder MODIFY `orderSn` CHAR(40) NOT NULL DEFAULT '' COMMENT '订单编号';
+ALTER TABLE xhOrder MODIFY `receiveAddress` VARCHAR(300) NOT NULL DEFAULT '' COMMENT '收货地址 详细街道地址';
+ALTER TABLE xhOrder MODIFY `receiveFullAddress` VARCHAR(400) NOT NULL DEFAULT '' COMMENT '完整收货地址';
+ALTER TABLE xhOrder MODIFY `receiveFloor` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '收货地址 楼号门牌号' AFTER `receiveAddress`;
+ALTER TABLE xhOrder MODIFY `sendType` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方式 0免配送 1自己送 2别人送，快递送';
+ALTER TABLE xhOrder ADD `sendSide` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方 0没有 1达达' AFTER `sendType`;
+ALTER TABLE xhOrder MODIFY `sendStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '配送状态：0未发货，待接单 1已发货，已接单 2已送达' AFTER `sendSide`;
 
 2019.12.15 shish 优惠券
 ALTER TABLE xhCoupon MODIFY `orderId` INT NOT NULL DEFAULT 0 COMMENT '优惠券使用的订单id';