From 071e7f5c828466e58518810ac8b002a44c30eb84 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 15 Jan 2026 14:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/order/service/ShopMerchantService.java  | 2 +-
 .../com/czg/service/order/service/impl/PayServiceImpl.java    | 2 +-
 .../service/order/service/impl/ShopMerchantServiceImpl.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java
index fa67d0c72..2474cd675 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopMerchantService.java
@@ -30,7 +30,7 @@ public interface ShopMerchantService extends IService<ShopMerchant> {
      */
     void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO);
 
-    ShopMerchant getById(Long shopId);
+    ShopMerchant getByShopId(Long shopId);
 
 
     ShopDirectMerchant getMainMerchant(Long shopId);
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index b0b1f2023..62fa5d641 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -181,7 +181,7 @@ public class PayServiceImpl implements PayService {
 
     private ShopMerchant getMerchant(Long shopId) {
         try {
-            ShopMerchant shopMerchant = shopMerchantService.getById(shopId);
+            ShopMerchant shopMerchant = shopMerchantService.getByShopId(shopId);
             if (shopMerchant == null || StrUtil.isBlank(shopMerchant.getChannel())) {
                 throw new CzgException("暂未开通支付!");
             }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java
index 83132d179..a62309b92 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java
@@ -109,9 +109,9 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
         update(upShopMerchant, query().eq(ShopMerchant::getRelatedLicenceNo, relatedLicenceNo));
     }
 
-    @Cacheable(key = "#id")
+    @Cacheable(key = "#shopId")
     @Override
-    public ShopMerchant getById(Long shopId) {
+    public ShopMerchant getByShopId(Long shopId) {
         ShopMerchant shopMerchant = getOne(query().eq(ShopMerchant::getShopId, shopId));
         AssertUtil.isNull(shopMerchant, "暂未开通支付.");
         return shopMerchant;