增加whereDoesntHave

app/AdminAgent/Controllers/AgentProductController.php

@@ -413,7 +413,11 @@ class AgentProductController extends AdminController
 					['is_cloud', '=', 1],
 					['type', '=', 1],
 					['agent_id', '<>', Admin::user()->id],
-				])->find($form->agent_cloud_pid);
+				])->whereDoesntHave('agentProductItem', function ($query) {
+					return $query->whereHas('product', function ($query) {
+						return $query->where('stock', '<=', 0)->orWhere('status', '<>', ProductStatus::ON_SALE);
+					});
+				})->find($form->agent_cloud_pid);
 
 				if (!$cloud_product) {
 					return $form->response()->error('你选择的组团云产品库存不足或已下架，请重新选择');

app/AdminAgent/Renderable/SelectAgentCloudProduct.php

@@ -30,7 +30,12 @@ class SelectAgentCloudProduct extends LazyRenderable
 				['is_cloud', '=', 1],
 				['type', '=', 1],
 				['agent_id', '<>', Admin::user()->id],
-			]);
+			])->whereDoesntHave('agentProductItem', function ($query) {
+					return $query->whereHas('product', function ($query) {
+						return $query->where('stock', '<=', 0)->orWhere('status', '<>', ProductStatus::ON_SALE);
+					});
+				});
+
 
 			$grid->quickSearch(['title'])->placeholder('搜索产品名称');
 

app/AdminAgent/Renderable/SelectAgentProduct.php

@@ -25,7 +25,12 @@ class SelectAgentProduct extends LazyRenderable
 			$grid->disableBatchActions();
 
 			$grid->model()->where('stock', '>', 0)
-				->where(['agent_id' => Admin::user()->id, 'status' => ProductStatus::ON_SALE]);
+				->where(['agent_id' => Admin::user()->id, 'status' => ProductStatus::ON_SALE])
+				->whereDoesntHave('agentProductItem', function ($query) {
+					return $query->whereHas('product', function ($query) {
+						return $query->where('stock', '<=', 0)->orWhere('status', '<>', ProductStatus::ON_SALE);
+					});
+				});
 			$grid->quickSearch(['title'])->placeholder('搜索产品名称');
 
 			$grid->column('id');