发货管理接口

app/business/controllers/OrderController.php

@@ -36,7 +36,7 @@ class OrderController extends BaseController
 		$detail = OrderService::getDetail();
 		util::success($detail);
 	}
-
+	
 	//订单归类 shish 2019.12.17
 	public function actionClassify()
 	{
@@ -46,9 +46,21 @@ class OrderController extends BaseController
 		OrderService::valid($order, $this->merchantId);
 		$categoryId = isset($post['categoryId']) ? $post['categoryId'] : $post['categoryId'];
 		$usageId = isset($post['usageId']) ? $post['usageId'] : $post['usageId'];
-
+		
 		OrderService::classify($id, $categoryId, $usageId);
 		util::ok();
 	}
 
+	//更新配送单 shish 2019.12.17
+	public function actionUpdateSheet()
+	{
+		$post = Yii::$app->request->post();
+		$id = isset($post['id']) ? $post['id'] : 0;
+		unset($post['id']);
+		$order = OrderService::getById($id);
+		OrderService::valid($order, $this->merchantId);
+		OrderService::updateSheet($order, $post);
+		util::ok('提交成功');
+	}
+
 }

biz/order/classes/OrderClass.php

@@ -34,12 +34,12 @@ class OrderClass extends BaseClass
 		$return = self::add($data);
 		return $return;
 	}
-	
+
 	public static function getByOrderSn($orderSn)
 	{
 		return self::getByCondition(['orderSn' => $orderSn]);
 	}
-	
+
 	//评价 shish 2019.12.16
 	public static function comment($data)
 	{

biz/order/services/OrderService.php

@@ -32,9 +32,9 @@ class OrderService extends BaseService
 		if (isset($data['list']) == false || empty($data['list'])) {
 			return $data;
 		}
-
+		
 		$orderIds = array_column($data['list'], 'id');
-
+		
 		//获取订单的商品信息
 		$goodsList = OrderGoodsService::getGoodsListByOrderIds($orderIds);
 		
@@ -121,7 +121,7 @@ class OrderService extends BaseService
 			$order->usageId = $usageId;
 			$order->classify = 1;
 			$order->save();
-
+			
 			//设置流水的分类和用途并分配资金
 			$setData = [
 				'merchantId' => $order->merchantId,
@@ -133,7 +133,7 @@ class OrderService extends BaseService
 				'payWay' => $order->payWay,
 			];
 			MerchantCapitalService::orderClassify($setData);
-
+			
 			$transaction->commit();
 		} catch (Exception $e) {
 			$transaction->rollBack();
@@ -141,4 +141,14 @@ class OrderService extends BaseService
 		}
 	}
 	
+	//更新配送单 shish 2019.12.17
+	public static function updateSheet($order, $data)
+	{
+		$id = $order['id'];
+		if (in_array($order['status'], [0, 1]) == false) {
+			util::fail('订单当前状态不是待配送，不能修改');
+		}
+		OrderClass::updateById($id, $data);
+	}
+
 }