From b9e768bd47591e7af374554be01374a16f399c4b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 23 Jan 2026 10:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=20=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/ShopMerchantServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 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 66494a4fd..39d460440 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
@@ -14,7 +14,6 @@ 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;
@@ -81,7 +80,9 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
         }
         shopMerchant.setShopId(shopMerchantParam.getShopId());
         if (isUp) {
-            shopMerchant.setChannel(CzgStrUtils.getStrOrNull(shopMerchantParam.getChannel()));
+            if (StrUtil.isNotBlank(shopMerchantParam.getChannel())) {
+                shopMerchant.setChannel(shopMerchantParam.getChannel());
+            }
             shopMerchant.setRelatedId(shopMerchantParam.getRelatedId());
             if (shopMerchant.getRelatedId() != null && !shopMerchantParam.getRelatedId().equals(shopMerchant.getRelatedId())) {
                 ShopDirectMerchant shopDirectMerchant = shopDirectMerchantService.getById(shopMerchant.getRelatedId());