Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

app/AdminSupplier/Extensions/Grid/ChangeOrderStatus.php → app/AdminAgent/Extensions/Grid/ChangeOrderStatus.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace App\AdminSupplier\Extensions\Grid;
+namespace App\AdminAgent\Extensions\Grid;
 use App\Common\OrderStatus;
 use App\Models\Order;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Grid\RowAction;
-use Illuminate\Support\Facades\DB;
 
 /**
  * 改变订单状态
@@ -27,9 +26,7 @@ class ChangeOrderStatus extends RowAction
 	public function handle()
 	{
 		try {
-			$order = Order::query()->whereHas('orderProductItem', function ($query) {
-				$query->where(['supplier_id' => Admin::user()->id, 'order_id' => $this->getKey()]);
-			})->firstWhere(['id' => $this->getKey(), 'status' => OrderStatus::OFFLINE_UNPAID]);
+			$order = Order::firstWhere(['id' => $this->getKey(), 'agent_id' => Admin::user()->id, 'status' => OrderStatus::OFFLINE_UNPAID]);
 			if (!$order) {
 				return $this->response()->error("订单不存在或已处理过了")->refresh();
 			}