From 7f64a64dc812858423fbf6f7655cf4806a381c61 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Thu, 15 Jan 2026 10:17:58 +0800
Subject: [PATCH] =?UTF-8?q?shopid=20=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/service/impl/ShopMerchantServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

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 333852e8c..8d001b050 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
@@ -74,6 +74,7 @@ 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);