From f3ccf81a4f203dd0d8957bab15c491cb2181e071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
index cc7d618..210eaf1 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java
@@ -26,6 +26,7 @@
import cn.lili.modules.lmk.domain.form.ScanPrizeForm;
import cn.lili.modules.lmk.domain.vo.ScanPrizeVO;
import cn.lili.modules.lmk.domain.query.ScanPrizeQuery;
+import groovyjarjarpicocli.CommandLine;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -119,7 +120,6 @@
*/
@Override
public Result page(ScanPrizeQuery query) {
-
IPage<ScanPrizeVO> page = PageUtil.getPage(query, ScanPrizeVO.class);
LambdaQueryWrapper<ScanPrize> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Objects.nonNull(query.getStoreId()), ScanPrize::getStoreId, query.getStoreId());
@@ -234,6 +234,7 @@
return prizeClaimRecord;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result claimPrize(String id) {
AuthUser currentUser = UserContext.getCurrentUser();
if (currentUser == null) {
@@ -320,6 +321,10 @@
if (!PrizeActivityStatusEnum.ON.name().equals(storePrize.getEnableStatus())) {
throw new ServiceException("褰撳墠娲诲姩娌℃湁寮�鍚�");
}
+ if (!ClaimStatusEnum.NOT_CLAIM.name().equals(storePrize.getClaimStatus())) {
+ throw new ServiceException("褰撳墠鎶藉鏈轰細琚鍙�");
+ }
+
String activityCover = storePrize.getActivityCover();
if (StringUtils.isNotBlank(activityCover)&&!activityCover.contains("http")) {
storePrize.setActivityCover(cosUtil.getPreviewUrl(activityCover));
--
Gitblit v1.8.0