上传图片到本地

modules/Order/app/Services/OrderService.php

@@ -704,18 +704,32 @@ class OrderService {
 		if(!$order){
 			throw new \Exception("订单不存在!", 0);
 		}
+
+		$item = $order->detail()->where('id', $request->input('detail_id'))->first();
+		if(!$item){
+			throw new \Exception("订单详情不存在!", 0);
+		}
+
+		if ($request->is('api/*') && auth('api')->user()){
 			//判断是否为店主
-		$level = auth('api')->user()->level()->where('store_id', '=', $order['store_id'])->first();
-		if(!$level || $level['name'] != 'master'){
-			throw new \Exception("您不是店主，无权核销!", 0);
+			$store = \Modules\Store\Models\Store::where('id', $item['store_id'])->where('status', 1)->select(['id', 'member_id', 'status'])->first();
+			if($store->member_id != auth('api')->user()->uid){
+				throw new \Exception("您不是店主，无权发货!", 0);
+			}
+		}else{
+			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->save();
 
-		\Modules\Goods\Events\OrderTake::dispatch($order);
+		$item->status = 3;
+		$item->delivery_time = date('Y-m-d H:i:s');
+		$item->delivery_type = $request->input('delivery_type', 'pickup');
+		$item->save();
+
+		\Modules\Order\Events\OrderTake::dispatch($order, $item);
 
 		return $order;
 	}

modules/System/app/Controllers/Api/File.php

@@ -10,6 +10,7 @@ namespace Modules\System\Controllers\Api;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\BaseController;
+use Illuminate\Support\Facades\Storage;
 
 class File extends BaseController {
 
@@ -82,6 +83,9 @@ class File extends BaseController {
 
 			$path = $file->store('images/'.date('Ymd'));
 
+			// 保存图片到storage/app/public/images目录
+			//$bool = Storage::disk('public')->put($path, file_get_contents($file -> getRealPath()));//解决方式 换成 Storage::disk('')->put()
+
 			$data = [
 				'path' => $path,
 				'url' => Storage::disk()->url($path),