核销

modules/Order/app/Services/OrderService.php

@@ -705,11 +705,13 @@ class OrderService {
 		//判断是否为店主
 		$level = auth('api')->user()->level()->where('store_id', '=', $order['store_id'])->first();
 		if(!$level || $level['name'] != 'master'){
-			throw new \Exception("您不是店主，无权发货!", 0);
+			throw new \Exception("您不是店主，无权核销!", 0);
 		}
 
 		$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);

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

@@ -10,7 +10,7 @@ namespace Modules\Store\Controllers\Api;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\BaseController;
-use Modules\Goods\Services\OrderService;
+use Modules\Order\Services\OrderService;
 
 class Order extends BaseController {
 
@@ -32,4 +32,22 @@ class Order extends BaseController {
 
 		return response()->json($this->data);
 	}
+
+	/**
+	 * @title 订单详情
+	 *
+	 * @param Request $request
+	 * @param \Modules\Order\Services\OrderService $service
+	 * @return void
+	 */
+	public function detail(Request $request, OrderService $service){
+		try {
+			$this->data['data'] = $service->getData($request);
+		} catch (\Throwable $th) {
+			$this->data['code'] = 0;
+			$this->data['message'] = $th->getMessage();
+		}
+
+		return response()->json($this->data);
+	}
 }