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

---
 .../service/impl/ShopMerchantServiceImpl.java | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 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 4ef914aec..7fc34917e 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
@@ -3,7 +3,6 @@ package com.czg.service.order.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.service.ShopInfoService;
-import com.czg.constant.PayChannelCst;
 import com.czg.constants.SystemConstants;
 import com.czg.order.dto.ShopMerchantDTO;
 import com.czg.order.entity.ShopDirectMerchant;
@@ -14,6 +13,7 @@ import com.czg.pay.PolyMerchantDTO;
 import com.czg.service.order.mapper.ShopMerchantMapper;
 import com.czg.service.order.service.ShopDirectMerchantService;
 import com.czg.utils.AssertUtil;
+import com.czg.utils.CzgStrUtils;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotBlank;
@@ -76,24 +76,17 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
         ShopMerchant shopMerchant = getOne(query().eq(ShopMerchant::getShopId, shopMerchantParam.getShopId()));
         if (shopMerchant == null) {
             shopMerchant = new ShopMerchant();
-            shopMerchant.setShopId(shopMerchantParam.getShopId());
-            shopMerchant.setChannel(shopMerchantParam.getChannel());
-            shopMerchant.setRelatedLicenceNo(shopMerchantParam.getRelatedLicenceNo());
             shopMerchant.setAlipayAppId(SystemConstants.PayType.ALIPAY_APP_ID);
             shopMerchant.setWechatAppId(SystemConstants.PayType.WECHAT_APP_ID);
-            if (PayChannelCst.NATIVE.equals(shopMerchantParam.getChannel()) && shopMerchantParam.getNativeMerchantDTO() != null) {
+        }
+        shopMerchant.setShopId(shopMerchantParam.getShopId());
+        if (isUp) {
+            shopMerchant.setChannel(CzgStrUtils.getStrOrNull(shopMerchantParam.getChannel()));
+            shopMerchant.setRelatedLicenceNo(CzgStrUtils.getStrOrNull(shopMerchantParam.getRelatedLicenceNo()));
+            if (shopMerchantParam.getNativeMerchantDTO() != null) {
                 shopMerchant.setNativePayJson(JSONObject.toJSONString(shopMerchantParam.getNativeMerchantDTO()));
-            } else if (PayChannelCst.POLY.equals(shopMerchantParam.getChannel()) && shopMerchantParam.getPolyMerchantDTO() != null) {
-                shopMerchant.setPolyPayJson(JSONObject.toJSONString(shopMerchantParam.getPolyMerchantDTO()));
             }
-        } else if (isUp) {
-            shopMerchant.setChannel(shopMerchantParam.getChannel());
-            shopMerchant.setShopId(shopMerchantParam.getShopId());
-            shopMerchant.setRelatedLicenceNo(shopMerchantParam.getRelatedLicenceNo());
-
-            if (PayChannelCst.NATIVE.equals(shopMerchantParam.getChannel()) && shopMerchantParam.getNativeMerchantDTO() != null) {
-                shopMerchant.setNativePayJson(JSONObject.toJSONString(shopMerchantParam.getNativeMerchantDTO()));
-            } else if (PayChannelCst.POLY.equals(shopMerchantParam.getChannel()) && shopMerchantParam.getPolyMerchantDTO() != null) {
+            if (shopMerchantParam.getPolyMerchantDTO() != null) {
                 shopMerchant.setPolyPayJson(JSONObject.toJSONString(shopMerchantParam.getPolyMerchantDTO()));
             }
         } else {