From 0b7f3318776300abf74f3c31f98120fa1bf96d2f Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 4 Sep 2023 13:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/community/Community.php        | 3 ++-
 app/controller/api/server/StoreProduct.php        | 3 ++-
 app/controller/merchant/store/product/Product.php | 3 ++-
 app/listener/ProductCreate.php                    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/community/Community.php b/app/controller/api/community/Community.php
index 7a905325..0a5fc65e 100644
--- a/app/controller/api/community/Community.php
+++ b/app/controller/api/community/Community.php
@@ -620,7 +620,8 @@ class Community extends BaseController
     public function entrust()
     {
         $data = $this->checkParams();
-        $merchantInfo = Db::name('merchant')->where('mer_id', $data['entrust_mer_id'] ?? 0)->where('type_id', Merchant::TypeSupplyChain)->fetchSql(false)->find();
+        $typeSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeSupplyChain'])->value('mer_type_id');
+        $merchantInfo = Db::name('merchant')->where('mer_id', $data['entrust_mer_id'] ?? 0)->where('type_id', $typeSupplyChainId)->fetchSql(false)->find();
         if (!$merchantInfo) {
             return app('json')->fail('此商户不支持委托');
         }
diff --git a/app/controller/api/server/StoreProduct.php b/app/controller/api/server/StoreProduct.php
index ba15ae7f..c373ca55 100644
--- a/app/controller/api/server/StoreProduct.php
+++ b/app/controller/api/server/StoreProduct.php
@@ -120,7 +120,8 @@ class StoreProduct extends BaseController
         }
         $data['mer_status'] = ($merchant['is_del'] || !$merchant['mer_state'] || !$merchant['status']) ? 0 : 1;
         $data['mer_id'] = $merId;
-        $productType = $merchant->type_id == Merchant::TypeSupplyChain ? 98 : 0;
+        $typeSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeSupplyChain'])->value('mer_type_id');
+        $productType = $merchant->type_id == $typeSupplyChainId ? 98 : 0;
         $this->repository->edit($id, $data, $merId, $productType, 1);
         return app('json')->success('编辑成功');
     }
diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php
index 024de0f0..a931785b 100644
--- a/app/controller/merchant/store/product/Product.php
+++ b/app/controller/merchant/store/product/Product.php
@@ -118,7 +118,8 @@ class Product extends BaseController
         $data['mer_status'] = ($this->request->merchant()->is_del || !$this->request->merchant()->mer_state || !$this->request->merchant()->status) ? 0 : 1;
         $data['mer_id'] = $this->request->merId();
         $data['update_time'] = date('Y-m-d H:i:s');
-        $productType = $this->request->merchant()->type_id == Merchant::TypeSupplyChain ? 98 : 0;
+        $typeSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeSupplyChain'])->value('mer_type_id');
+        $productType = $this->request->merchant()->type_id == $typeSupplyChainId ? 98 : 0;
         $this->repository->edit($id, $data, $this->request->merId(), $productType);
         return app('json')->success('编辑成功');
     }
diff --git a/app/listener/ProductCreate.php b/app/listener/ProductCreate.php
index c22b0731..1b942526 100644
--- a/app/listener/ProductCreate.php
+++ b/app/listener/ProductCreate.php
@@ -39,7 +39,8 @@ class ProductCreate
                 $data['status'] = $cityMerchant['is_audit'] ? 0 : 1;
                 $data['mer_status'] = ($cityMerchant['is_del'] || !$cityMerchant['mer_state'] || !$cityMerchant['status']) ? 0 : 1;
                 $data['rate'] = 3;
-                $productType = $cityMerchant['type_id'] == Merchant::TypeSupplyChain ? 98 : 0;
+                $typeSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeSupplyChain'])->value('mer_type_id');
+                $productType = $cityMerchant['type_id'] == $typeSupplyChainId ? 98 : 0;
                 $data['update_time'] = date('Y-m-d H:i:s');
                 app()->make(ProductRepository::class)->create($data, $productType, $contentType);
             }