Merge remote-tracking branch 'origin/feature_hg_20240716' into feature_hg_20240716

fengliang
2 parents 2ce89df0 72fa3e5c
Showing 2 changed files with 2 additions and 2 deletions
etrade-shop/src/main/java/com/diligrp/etrade/shop/constant/ShopMQConstant.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/impl/ShopApproveServiceImpl.java
@@ -22,7 +22,7 @@ public interface ShopMQConstant {
     /**
      * 2、客户新注册后 MQ 消息同步 队列
      */
-    String CUSTOMER_ADD_CREATESHOPQUEUE = "dili.customer.add.createShopQueue";
+    String CUSTOMER_ADD_CREATESHOPQUEUE = "dili.customer.add.createShopQueue.xtrade";
  
     /**
      * 2、客户新注册后 MQ 消息同步 交换机配置
@@ -545,7 +545,7 @@ public class ShopApproveServiceImpl implements ShopApproveService {
             Shop shopOld = shopMapper.selectByPrimaryKey(newShopApprove.getShopId());
             log.info("店铺修改直接更新店铺 shopOld={}", shopOld);
             if (shopOld != null &&
-                    newShopApprove.getCardNo() != null
+                    StringUtils.isNotBlank(newShopApprove.getCardNo())
                     && !StrUtil.equals(newShopApprove.getCardNo(), shopOld.getCardNo())) {
                 UserAccountSingleQueryDto cardQuery = new UserAccountSingleQueryDto();
                 cardQuery.setFirmId(shopOld.getMarketId());