From 8533ebdc60699631989b2163b1a0b2732ec5681f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Fri, 10 Mar 2023 15:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/system/supplychain/SupplyChain.php             | 1 +
 app/common/model/system/supplychain/SupplyChainLinkMerchant.php | 2 +-
 app/common/repositories/store/product/SpuRepository.php         | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/model/system/supplychain/SupplyChain.php b/app/common/model/system/supplychain/SupplyChain.php
index 70139318..c557efe3 100644
--- a/app/common/model/system/supplychain/SupplyChain.php
+++ b/app/common/model/system/supplychain/SupplyChain.php
@@ -21,6 +21,7 @@ class SupplyChain extends BaseModel
 
     // 设置当前模型的数据库连接
     protected $connection = 'nongke';
+    protected $table = 'fa_supply_chain';
 
     /**
      * @return string
diff --git a/app/common/model/system/supplychain/SupplyChainLinkMerchant.php b/app/common/model/system/supplychain/SupplyChainLinkMerchant.php
index 1461e960..c81c2473 100644
--- a/app/common/model/system/supplychain/SupplyChainLinkMerchant.php
+++ b/app/common/model/system/supplychain/SupplyChainLinkMerchant.php
@@ -22,7 +22,7 @@ class SupplyChainLinkMerchant extends BaseModel
 
     // 设置当前模型的数据库连接
     protected $connection = 'nongke';
-
+    protected $table = 'fa_supply_chain_link_merchant';
     /**
      * @return string
      * @author xaboy
diff --git a/app/common/repositories/store/product/SpuRepository.php b/app/common/repositories/store/product/SpuRepository.php
index 1b9877e5..85c6e57b 100644
--- a/app/common/repositories/store/product/SpuRepository.php
+++ b/app/common/repositories/store/product/SpuRepository.php
@@ -160,6 +160,8 @@ class SpuRepository extends BaseRepository
 
             // 只获取当前供应链内商户的商品
             $query->whereIn('S.mer_id', $MerListId);
+            //获取自提
+            $query->whereLike('delivery_way',"%1%");
         }
         
         $productMake = app()->make(ProductRepository::class);