订单处理

app/business/controllers/OrderController.php

@@ -31,14 +31,14 @@ class OrderController extends BaseController
 	}
 	
 	//订单详情 shish 2019.12.16
-	public static function actionDetail()
+	public function actionDetail()
 	{
 		$id = Yii::$app->request->get('id');
 		$detail = OrderService::getDetail();
 		util::success($detail);
 	}
-
-	//发货管理 shish 2019.11.30
+	
+	//发货管理 shish 2019.12.16
 	public function actionSendDetail()
 	{
 		$id = Yii::$app->request->get('id', 0);
@@ -48,30 +48,18 @@ class OrderController extends BaseController
 		util::success($list);
 	}
 	
-	//发货流程更新 shish 2019.12.15
-	public function actionSendUpdate()
-	{
-		$post = Yii::$app->request->post();
-		$id = isset($post['id']) ? $post['id'] : 0;
-		$actionId = isset($post['actionId']) ? $post['actionId'] : 0;
-		$option = isset($post['option']) ? $post['option'] : 0;
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->merchantId);
-		OrderSendService::sendUpdate(['id' => $id, 'actionId' => $actionId, 'option' => $option]);
-		util::ok('操作成功');
-	}
-	
-	//打单 免填单 填单
+	//打单 免填单 填单 shish 2019.12.16
 	public function actionPrintOrder()
 	{
 		$post = Yii::$app->request->post();
 		$id = isset($post['id']) ? $post['id'] : 0;
+		$option = isset($post['option']) ? $post['option'] : 0;
 		$order = OrderService::getById($id);
 		OrderService::valid($order, $this->merchantId);
 		OrderSendService::printOrder(['id' => $id, 'option' => $option]);
 		util::ok('操作成功');
 	}
-	
+
 	//向快递公司发起配送需求
 	public function actionExpress()
 	{

biz/order/classes/OrderSendClass.php

@@ -16,7 +16,14 @@ class OrderSendClass extends BaseClass
 	
 	//流程id与名称
 	public static $actionId = ['placeOrder' => 10, 'printOrder' => 20, 'deliver' => 30, 'reach' => 40, 'finish' => 50];
-	public static $actionName = [10 => '下单', 20 => '打单', 30 => '发货', 40 => '送达', 50 => '完成'];
+	public static $action = [
+		10 => ['name' => '下单', 'sign' => 'placeOrder'],
+		20 => ['name' => '打单', 'sign' => 'printOrder',],
+		30 => ['name' => '发货', 'sign' => 'deliver'],
+		40 => ['name' => '送达', 'sign' => 'reach'],
+		50 => ['name' => '完成', 'sign' => 'finish'],
+	];
+	
 	
 	//发货详情 shish 2019.12.15
 	public static function sendDetail($orderId)
@@ -25,10 +32,11 @@ class OrderSendClass extends BaseClass
 		if (empty($list)) {
 			return [];
 		}
-		$nameList = self::$actionName;
+		$nameList = self::$action;
 		foreach ($list as $key => $val) {
 			$actionId = $val['actionId'];
-			$list[$key]['actionName'] = isset($nameList[$actionId]) ? $nameList[$actionId] : '';
+			$list[$key]['actionName'] = isset($nameList[$actionId]['name']) ? $nameList[$actionId]['name'] : '';
+			$list[$key]['actionSign'] = isset($nameList[$actionId]['sign']) ? $nameList[$actionId]['sign'] : '';
 		}
 		return $list;
 	}
@@ -50,24 +58,9 @@ class OrderSendClass extends BaseClass
 		$data = ['actionId' => $printOrderId, 'orderId' => $orderId, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $printOrderId];
 		self::add($data);
 	}
-	
-	//发货流程更新
-	public static function sendUpdate($data)
-	{
-		$id = $data['id'];
-		$actionId = $data['actionId'];
-		$option = $data['option'];
-		$currentId = self::onActionId($id);
-		$time = time();
-		if ($currentId != $actionId) {
-			util::fail('超期或过期操作');
-		}
-		self::updateByCondition(['orderId' => $id, 'actionId' => $actionId], ['option' => $option, 'finishTime' => $time]);
-		util::ok('操作成功');
-	}
-	
-	//当前订单待操作action shish 2019.12.16
-	public static function onActionId($id)
+
+	//当前待执行的动作 shish 2019.12.16
+	public static function toDoActionId($id)
 	{
 		$list = self::sendDetail($id);
 		$actionId = 0;
@@ -85,14 +78,14 @@ class OrderSendClass extends BaseClass
 		$option = $data['option'];
 		$actionIdList = self::$actionId;
 		$printOrderId = $actionIdList['printOrder'];
-		$currentId = self::onActionId($id);
+		$currentId = self::toDoActionId($id);
 		if ($printOrderId == $currentId) {
 			util::fail('过期或超期操作');
 		}
 		
 		//免填单
 		if ($option == 1) {
-
+			
 			//填单
 		} elseif ($option == 2) {
 		
@@ -101,12 +94,18 @@ class OrderSendClass extends BaseClass
 		}
 		$time = time();
 		self::updateByCondition(['orderId' => $id, 'actionId' => $printOrderId], ['option' => $option, 'finishTime' => $time]);
-
+		
 		//进入发货流程
 		$deliverId = $actionIdList['deliver'];
 		$data = ['actionId' => $deliverId, 'orderId' => $orderId, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $deliverId];
 		self::add($data);
-
+		
 	}
-
+	
+	//发货 shish 2019.12.16
+	public static function deliver()
+	{
+		
+	}
+	
 }

biz/order/services/OrderSendService.php

@@ -25,11 +25,6 @@ class OrderSendService extends BaseService
 		return OrderSendClass::sendDetail($orderId);
 	}
 	
-	public static function sendUpdate($data)
-	{
-		return OrderSendClass::sendUpdate($data);
-	}
-	
 	public static function printOrder($data)
 	{
 		return OrderSendClass::printOrder($data);