From 9769aba30c3459e1a620c55c1933bba3d60157a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <570057076@qq.com>
Date: Mon, 15 Dec 2025 09:42:30 +0000
Subject: [PATCH] Merge #12 into master from cc_20251215_xinfa
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat:先更新

* cc_20251215_xinfa: (2 commits squashed)

  - feat:叫号屏

  - feat:先更新

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/12
---
 .../src/main/java/com/cool/store/enums/SpecialTagEnum.java   | 3 ++-
 .../cool/store/service/impl/SignFranchiseServiceImpl.java    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
index d022a0728..1b1136524 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
@@ -14,7 +14,8 @@ public enum SpecialTagEnum {
     ELECTRONIC_PRICE_LIST("电子价目牌"),
     ACTIVITY_CAROUSEL("活动轮播"),
     ACTIVITY_PACKAGE("活动套餐"),
-    PROMOTIONAL_VIDEO("宣传视频");
+    PROMOTIONAL_VIDEO("宣传视频"),
+    CALLING_SCREEN("叫号屏");;
 
     private final String tagName;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
index 2f784187a..65e239aa7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
@@ -228,6 +228,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             //10s过期
             acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS);
             if (Boolean.TRUE.equals(acquired)) {
+                //修改shop & point
+                updateShopAndPoint(request, shopInfoDO, pointInfoById);
+
                 SignFranchiseDO signFranchiseDO = request.toSignFranchiseDO();
                 if (Objects.isNull(request.getId())) {
                     signFranchiseDO.setCreateUserId(user.getUserId());
@@ -268,8 +271,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
 
                     }
                 }
-                //修改shop & point
-                updateShopAndPoint(request, shopInfoDO, pointInfoById);
 
                 return new ResponseResult(200000, "提交成功");
             } else {