From 4ea9eae48352a359f18561c5f330b8462df06a08 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 16:09:24 +0800
Subject: [PATCH] 表名

---
 framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 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 9e55bd0..0193259 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
@@ -13,6 +13,7 @@
 import cn.lili.modules.lmk.mapper.ScanPrizeMapper;
 import cn.lili.modules.lmk.service.ScanPrizeService;
 import cn.lili.base.Result;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.lili.modules.lmk.domain.form.ScanPrizeForm;
@@ -24,12 +25,14 @@
 import lombok.RequiredArgsConstructor;
 import cn.lili.utils.PageUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -107,7 +110,12 @@
      */
     @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());
+        wrapper.eq(StringUtils.isNotBlank(query.getStatus()), ScanPrize::getStatus, query.getStatus());
+        wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), ScanPrize::getGenerateStatus, query.getGenerateStatus());
         baseMapper.getPage(page, query);
         return Result.ok().data(page.getRecords()).total(page.getTotal());
     }
@@ -156,6 +164,7 @@
     }
 
     @Override
+    @Transactional
     public Result generateStorePrize(String id) {
 
         RLock redissonLock = redissonClient.getLock(STORE_PRIZE_GENERATE + id);
@@ -209,7 +218,7 @@
         prizeClaimRecord.setStoreId(scanPrize.getStoreId());
         prizeClaimRecord.setStoreName(scanPrize.getStoreName());
         prizeClaimRecord.setPrizeActivityId(scanPrize.getPrizeActivityId());
-        prizeClaimRecord.setPrizeActivityName(scanPrize.getPrizeActivityNmae());
+        prizeClaimRecord.setPrizeActivityName(scanPrize.getPrizeActivityName());
         prizeClaimRecord.setClaimStatus(ClaimStatusEnum.NOT_CLAIM.name());
         prizeClaimRecord.setNo(String.format("%08d", i));
         prizeClaimRecord.setMaterial(MaterialStatusEnum.NOT_GENERATE.name());

--
Gitblit v1.8.0