From 656db661abea5b2076522cdaba5374ac6c595b99 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 16 Jan 2026 18:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ShopMerchantServiceImpl.java | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

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 b7e95fb06..6feb1f464 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
@@ -8,6 +8,7 @@ import com.czg.order.dto.ShopMerchantDTO;
 import com.czg.order.entity.ShopDirectMerchant;
 import com.czg.order.entity.ShopMerchant;
 import com.czg.order.service.ShopMerchantService;
+import com.czg.pay.AlipayAuthInfoDto;
 import com.czg.pay.NativeMerchantDTO;
 import com.czg.pay.PolyMerchantDTO;
 import com.czg.service.order.mapper.ShopMerchantMapper;
@@ -82,8 +83,22 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
         if (isUp) {
             shopMerchant.setChannel(CzgStrUtils.getStrOrNull(shopMerchantParam.getChannel()));
             shopMerchant.setRelatedId(shopMerchantParam.getRelatedId());
-            if (shopMerchantParam.getNativeMerchantDTO() != null) {
-                shopMerchant.setNativePayJson(JSONObject.toJSONString(shopMerchantParam.getNativeMerchantDTO()));
+            if (shopMerchantParam.getRelatedId() == null || !shopMerchantParam.getRelatedId().equals(shopMerchant.getRelatedId())) {
+                ShopDirectMerchant shopDirectMerchant = shopDirectMerchantService.getById(shopMerchantParam.getRelatedId());
+                if (shopDirectMerchant != null) {
+                    NativeMerchantDTO nativeMerchantDTO = new NativeMerchantDTO();
+                    nativeMerchantDTO.setWechatMerchantId(shopDirectMerchant.getWechatMerchantId());
+                    nativeMerchantDTO.setAlipayMerchantId(shopDirectMerchant.getAlipayMerchantId());
+                    if (StrUtil.isNotBlank(shopDirectMerchant.getAlipayAuthInfo())) {
+                        AlipayAuthInfoDto alipayAuthInfoDto = JSONObject.parseObject(shopDirectMerchant.getAlipayAuthInfo(), AlipayAuthInfoDto.class);
+                        nativeMerchantDTO.setAlipayAuthInfo(alipayAuthInfoDto);
+                    }
+                    shopMerchant.setNativePayJson(JSONObject.toJSONString(nativeMerchantDTO));
+                } else {
+                    shopMerchant.setNativePayJson(null);
+                    shopMerchant.setWechatAppId(null);
+                    shopMerchant.setAlipayAppId(null);
+                }
             }
             if (shopMerchantParam.getPolyMerchantDTO() != null) {
                 shopMerchant.setPolyPayJson(JSONObject.toJSONString(shopMerchantParam.getPolyMerchantDTO()));
@@ -97,7 +112,11 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
                 shopMerchant.setNativePayJson(JSONObject.toJSONString(shopMerchantParam.getNativeMerchantDTO()));
             }
         }
-        return saveOrUpdate(shopMerchant);
+        if (shopMerchant.getId() == null) {
+            return save(shopMerchant);
+        } else {
+            return updateById(shopMerchant, false);
+        }
     }
 
     @Override