From f3450326233f27338b3658f4b6664f3a279c6f8a Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 17:33:31 +0800
Subject: [PATCH] 更新
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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..a716a33 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;
@@ -118,13 +119,19 @@
* @return
*/
@Override
- public Result page(ScanPrizeQuery query) {
-
+ public Result page(ScanPrizeQuery query,String form) {
IPage<ScanPrizeVO> page = PageUtil.getPage(query, ScanPrizeVO.class);
LambdaQueryWrapper<ScanPrize> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Objects.nonNull(query.getStoreId()), ScanPrize::getStoreId, query.getStoreId());
wrapper.eq(StringUtils.isNotBlank(query.getStatus()), ScanPrize::getStatus, query.getStatus());
wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), ScanPrize::getGenerateStatus, query.getGenerateStatus());
+ if("seller".equals(form)){
+ String storeId = UserContext.getCurrentUser().getStoreId();
+ if (StringUtils.isNotBlank(storeId)){
+ wrapper.eq(ScanPrize::getStoreId, storeId);
+ }
+ }
+
baseMapper.getPage(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -234,6 +241,7 @@
return prizeClaimRecord;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result claimPrize(String id) {
AuthUser currentUser = UserContext.getCurrentUser();
if (currentUser == null) {
@@ -320,6 +328,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