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/resources/mapper/lmk/PrizeActivityMapper.xml | 7 ++++++-
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java | 6 +++---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java | 9 +++++++++
framework/src/main/java/cn/lili/modules/lmk/domain/form/ScanPrizeForm.java | 6 +++---
framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java | 4 ++++
framework/src/main/java/cn/lili/modules/lmk/domain/query/ScanPrizeQuery.java | 4 ++++
framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml | 6 +++---
7 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ScanPrizeForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ScanPrizeForm.java
index 0de4f04..c96de87 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ScanPrizeForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ScanPrizeForm.java
@@ -27,15 +27,15 @@
@NotNull(message = "搴楅摵id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("搴楅摵id")
- private Long storeId;
+ private String storeId;
@NotNull(message = "搴楅摵鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("搴楅摵鍚嶇О")
- private Long storeName;
+ private String storeName;
@NotNull(message = "鎶藉娲诲姩id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鎶藉娲诲姩id")
- private Long prizeActivityId;
+ private String prizeActivityId;
@NotBlank(message = "鎶藉娲诲姩鍚嶇О鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鎶藉娲诲姩鍚嶇О鍚嶇О")
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
index 22b9557..f551cc8 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
@@ -33,5 +33,9 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date endTime;
+
+ private String enableStatus;
+
+ private Boolean popup;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/ScanPrizeQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/ScanPrizeQuery.java
index 8daa571..aa6a1b0 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/ScanPrizeQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/ScanPrizeQuery.java
@@ -18,5 +18,9 @@
@Data
@ApiModel(value = "ScanPrize鏌ヨ鍙傛暟", description = "搴楅摵娲诲姩鍏宠仈鏌ヨ鍙傛暟")
public class ScanPrizeQuery extends AbsQuery {
+ private String generateStatus;
+ private String status;
+ private String storeId;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java
index 461ca24..ae006ca 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java
@@ -22,15 +22,15 @@
/** 搴楅摵id */
@ApiModelProperty("搴楅摵id")
- private Long storeId;
+ private String storeId;
/** 搴楅摵鍚嶇О */
@ApiModelProperty("搴楅摵鍚嶇О")
- private Long storeName;
+ private String storeName;
/** 鎶藉娲诲姩id */
@ApiModelProperty("鎶藉娲诲姩id")
- private Long prizeActivityId;
+ private String prizeActivityId;
/** 鎶藉娲诲姩鍚嶇О鍚嶇О */
@ApiModelProperty("鎶藉娲诲姩鍚嶇О鍚嶇О")
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 3338e6d..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);
diff --git a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
index c4cee58..2264e22 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
@@ -64,7 +64,12 @@
</if>
<if test="query.beginTime != null">AND LPA.begin_time >= #{query.beginTime}</if>
<if test="query.endTime != null">AND LPA.end_time <= #{query.endTime}</if>
-
+ <if test="query.enableStatus !=null and query.enableStatus !=''">
+ AND LPA.enable_status = #{query.enableStatus}
+ </if>
+ <if test="query.popup !=null and query.popup !=''">
+ AND LPA.popup = #{query.popup}
+ </if>
</select>
<resultMap id="prizeInfoMap" type="cn.lili.modules.lmk.domain.vo.PrizeDetailVO">
<id property="id" column="id"/>
diff --git a/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml b/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
index 3ddcba9..6cf1790 100644
--- a/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
@@ -8,7 +8,7 @@
<result column="store_id" property="storeId" />
<result column="store_name" property="storeName" />
<result column="prize_activity_id" property="prizeActivityId" />
- <result column="prize_activity_nmae" property="prizeActivityNmae" />
+ <result column="prize_activity_name" property="prizeActivityName" />
<result column="generate_status" property="generateStatus" />
<result column="generate_num" property="generateNum" />
<result column="claim_num" property="claimNum" />
@@ -26,7 +26,7 @@
LSP.store_id,
LSP.store_name,
LSP.prize_activity_id,
- LSP.prize_activity_nmae,
+ LSP.prize_activity_name,
LSP.generate_status,
LSP.generate_num,
LSP.claim_num,
@@ -44,7 +44,7 @@
LSP.store_id,
LSP.store_name,
LSP.prize_activity_id,
- LSP.prize_activity_nmae,
+ LSP.prize_activity_name,
LSP.generate_status,
LSP.generate_num,
LSP.claim_num,
--
Gitblit v1.8.0