shish 6 лет назад
Родитель
Сommit
6a59d4bf8a
2 измененных файлов с 35 добавлено и 2 удалено
  1. 34 2
      app/business/controllers/OrderController.php
  2. 1 0
      sql.txt

+ 34 - 2
app/business/controllers/OrderController.php

@@ -21,7 +21,7 @@ use common\components\configDict;
 
 class OrderController extends BaseController
 {
-
+	
 	public function actionList()
 	{
 		$get = Yii::$app->request->get();
@@ -40,11 +40,43 @@ class OrderController extends BaseController
 		$list = OrderService::getOrderList($where);
 		util::success($list);
 	}
-
+	
 	//发货管理 shish 2019.11.30
 	public function actionSend()
 	{
+	
+	}
+	
+	//向快递公司发起配送需求
+	public function actionExpress()
+	{
+	
+	}
+	
+	//取消快递
+	public function actionCancelExpress()
+	{
+		$sendSide = 1;
+		$sendTime = '10:21';
+	}
 
+	//添加小费
+	public function actionAddTip()
+	{
+
+	}
+
+	//结果回调通知
+	public function actionExpressCallback()
+	{
+
+	}
+	
+	//快递服务提供方
+	public function actionExpressProvide()
+	{
+		$data = ['id' => 1, 'name' => '达达'];
+		util::success($data);
 	}
 
 }

+ 1 - 0
sql.txt

@@ -2,6 +2,7 @@
 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晚上';
+ALTER TABLE xhOrder ADD sendTip DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '运费里增加的小费' AFTER `sendCost`;
 
 2019.12.15 11:57 刮刮卡表名变更
 RENAME TABLE xhGuaGua TO xhGgk;