订单核销

modules/Order/app/Services/OrderService.php

@@ -193,6 +193,8 @@ class OrderService {
 		return $data;
 	}
 
+
+
 	/**
 	 * @title 添加订单
 	 *
@@ -711,7 +713,6 @@ class OrderService {
 		$order->status = 3;
 		$order->confirm_time = date('Y-m-d H:i:s');
 		$order->delivery_time = date('Y-m-d H:i:s');
-		$order->delivery_type = $request->input('delivery_type', 'pickup');
 		$order->save();
 
 		\Modules\Goods\Events\OrderTake::dispatch($order);
@@ -719,6 +720,21 @@ class OrderService {
 		return $order;
 	}
 
+	/**商家订单详情
+	 * @param $request
+	 * @return \Illuminate\Database\Concerns\TValue|null
+	 * @throws \Exception
+	 */
+	public function getDetailsData($request){
+		$map = [];
+		$map[] = ['order_no', '=', $request->input('order_no')];
+		$data = Order::with(['member', 'detail', 'detail.goods:id,title,price,integral', 'detail.sku', 'detail.store:id,title,cover'])->where($map)->first();
+		if(!$data){
+			throw new \Exception("订单不存在！", 0);
+		}
+		return $data;
+	}
+
 	/**
 	 * @title 订单退款
 	 *

modules/Store/app/Controllers/Api/Order.php

@@ -42,7 +42,7 @@ class Order extends BaseController {
 	 */
 	public function detail(Request $request, OrderService $service){
 		try {
-			$this->data['data'] = $service->getData($request);
+			$this->data['data'] = $service->getDetailsData($request);
 		} catch (\Throwable $th) {
 			$this->data['code'] = 0;
 			$this->data['message'] = $th->getMessage();