From 01aad45a2b258e7e71f7f2197f0eda0b7c6c98ae Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 15 Jan 2026 10:47:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/task/EntryManagerTask.java   |  1 +
 .../order/service/ShopMerchantService.java    | 10 +++++++++
 .../service/impl/ShopMerchantServiceImpl.java | 21 +++++++++++--------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
index 9fe763cfc..3cfb7a9c4 100644
--- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
@@ -93,6 +93,7 @@ public class EntryManagerTask {
                 }
                 shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO);
                 shopMerchantService.editEntry(shopMerchantDTO, false);
+                shopMerchantService.upMerchant(licenceNo, nativeMerchantDTO);
             }
         }
     }
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 dda294cdd..b5e7b12e5 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
@@ -3,7 +3,10 @@ package com.czg.order.service;
 import com.czg.order.dto.ShopMerchantDTO;
 import com.czg.order.entity.ShopDirectMerchant;
 import com.czg.order.entity.ShopMerchant;
+import com.czg.pay.NativeMerchantDTO;
 import com.mybatisflex.core.service.IService;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 import java.io.Serializable;
 
@@ -22,6 +25,13 @@ public interface ShopMerchantService extends IService<ShopMerchant> {
      */
     Boolean editEntry(ShopMerchantDTO shopMerchantParam, boolean isUp);
 
+
+    /**
+     * 已绑定的支付
+     * 更新商户支付参数
+     */
+    void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO);
+
     @Override
     ShopMerchant getById(Serializable id);
 
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 7a3ea941c..4ef914aec 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
@@ -16,6 +16,8 @@ import com.czg.service.order.service.ShopDirectMerchantService;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
@@ -103,18 +105,19 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
                 shopMerchant.setNativePayJson(JSONObject.toJSONString(shopMerchantParam.getNativeMerchantDTO()));
             }
         }
-        if (PayChannelCst.NATIVE.equals(shopMerchantParam.getChannel())) {
-            if (StrUtil.isNotBlank(shopMerchant.getRelatedLicenceNo()) && (StrUtil.isNotBlank(shopMerchant.getAlipayAppId()) || StrUtil.isNotBlank(shopMerchant.getWechatAppId()))) {
-                ShopMerchant upShopMerchant = new ShopMerchant();
-                upShopMerchant.setAlipayAppId(shopMerchant.getAlipayAppId());
-                upShopMerchant.setWechatAppId(shopMerchant.getWechatAppId());
-                upShopMerchant.setNativePayJson(JSONObject.toJSONString(shopMerchantParam.getNativeMerchantDTO()));
-                update(upShopMerchant, query().eq(ShopMerchant::getRelatedLicenceNo, shopMerchantParam.getRelatedLicenceNo()));
-            }
-        }
         return saveOrUpdate(shopMerchant);
     }
 
+    @Override
+    @CacheEvict(allEntries = true)
+    public void upMerchant(@NotBlank String relatedLicenceNo, @NotNull NativeMerchantDTO nativeMerchantDTO) {
+        ShopMerchant upShopMerchant = new ShopMerchant();
+        upShopMerchant.setAlipayAppId(nativeMerchantDTO.getAlipayMerchantId());
+        upShopMerchant.setWechatAppId(nativeMerchantDTO.getWechatMerchantId());
+        upShopMerchant.setNativePayJson(JSONObject.toJSONString(nativeMerchantDTO));
+        update(upShopMerchant, query().eq(ShopMerchant::getRelatedLicenceNo, relatedLicenceNo));
+    }
+
     @Cacheable(key = "#id")
     @Override
     public ShopMerchant getById(Serializable id) {