Merge #12 into master from cc_20251215_xinfa

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

View File

@@ -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 {