suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #12 into master from cc_20251215_xinfa

Browse Source 
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
This commit is contained in:
苏竹红
2025-12-15 09:42:30 +00:00
parent b4b4d0b988
commit 9769aba30c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-common/src/main/java/com/cool/store/enums/SpecialTagEnum.java
View File

@@ -14,7 +14,8 @@ public enum SpecialTagEnum {
ELECTRONIC_PRICE_LIST("电子价目牌"), ELECTRONIC_PRICE_LIST("电子价目牌"),
ACTIVITY_CAROUSEL("活动轮播"), ACTIVITY_CAROUSEL("活动轮播"),
ACTIVITY_PACKAGE("活动套餐"), ACTIVITY_PACKAGE("活动套餐"),
PROMOTIONAL_VIDEO("宣传视频"); PROMOTIONAL_VIDEO("宣传视频"),
CALLING_SCREEN("叫号屏");;
private final String tagName; private final String tagName;

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -228,6 +228,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
//10s过期 //10s过期
acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS); acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS);
if (Boolean.TRUE.equals(acquired)) { if (Boolean.TRUE.equals(acquired)) {
//修改shop & point
updateShopAndPoint(request, shopInfoDO, pointInfoById);
SignFranchiseDO signFranchiseDO = request.toSignFranchiseDO(); SignFranchiseDO signFranchiseDO = request.toSignFranchiseDO();
if (Objects.isNull(request.getId())) { if (Objects.isNull(request.getId())) {
signFranchiseDO.setCreateUserId(user.getUserId()); signFranchiseDO.setCreateUserId(user.getUserId());
@@ -268,8 +271,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
} }
} }
//修改shop & point
updateShopAndPoint(request, shopInfoDO, pointInfoById);
return new ResponseResult(200000, "提交成功"); return new ResponseResult(200000, "提交成功");
} else { } else {