From 6d866f41165117688fb731bf94868baaba687fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 24 Mar 2025 21:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=93=BA=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/service/ShopPayTypeService.java  | 2 ++
 .../service/account/service/impl/ShopInfoServiceImpl.java | 5 +++++
 .../account/service/impl/ShopPayTypeServiceImpl.java      | 8 +++++---
 .../src/main/resources/mapper/ShopTableMapper.xml         | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java
index e9f5e486..cdef3366 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java
@@ -19,4 +19,6 @@ public interface ShopPayTypeService extends IService<ShopPayType> {
     Boolean add(Long shopId, ShopPayType shopPayType);
 
     Boolean edit(Long shopId, ShopPayTypeDTO shopPayTypeDTO);
+
+    void addInfo(Long shopId);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
index 42086799..c391a677 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
@@ -59,6 +59,8 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
     private ShopExtendService shopExtendService;
     @Resource
     private RedisService redisService;
+    @Resource
+    private ShopPayTypeService shopPayTypeService;
 
     @DubboReference
     private SysParamsService sysParamsService;
@@ -144,6 +146,9 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
         if (StrUtil.isNotBlank(shopInfoAddDTO.getActivateCode())) {
             activateShop(shopInfo, shopInfoAddDTO.getActivateCode());
         }
+
+        // 增加支付方式
+        shopPayTypeService.addInfo(shopInfo.getId());
         return updateById(shopInfo);
     }
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java
index 1b477a7e..8d3439f8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java
@@ -29,11 +29,13 @@ public class ShopPayTypeServiceImpl extends ServiceImpl<ShopPayTypeMapper, ShopP
             "cash", "现金",
             "bank", "银行卡",
             "scanCode", "扫码支付",
-            "deposit", "储值卡"
+            "deposit", "储值卡",
+            "virtual", "挂账支付"
     );
 
-    private void addInfo(Long shopId) {
-        payTypeMap.forEach((k, v) -> save(new ShopPayType().setPayType(k).setPayName(v).setShopId(shopId)));
+    @Override
+    public void addInfo(Long shopId) {
+        payTypeMap.forEach((k, v) -> save(new ShopPayType().setPayType(k).setPayName(v).setShopId(shopId).setIsShowShortcut("挂账支付".equals(v) ? 0 : 1)));
     }
 
     @Override
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
index 89f8de0d..6be66bbc 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
@@ -15,7 +15,7 @@
             and a.area_id=#{areaId}
         </if>
         <if test="tableCode != null and tableCode != ''">
-            and a.area_id=#{areaId}
+            and a.table_code=#{tableCode}
         </if>
         <if test="status != null and status != ''">
             and a.status=#{status}