From 18c28c7f440c45855a1bc20626d296d6aeef32c1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 16:42:36 +0800
Subject: [PATCH] 表名
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java | 6 +++---
framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml | 3 +++
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java | 2 ++
framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeClaimRecordQuery.java | 1 +
manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java | 11 ++++++++++-
framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml | 2 ++
framework/src/main/java/cn/lili/modules/lmk/enums/general/MaterialStatusEnum.java | 4 ++--
7 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeClaimRecordQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeClaimRecordQuery.java
index 330b3bc..ea5e56f 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeClaimRecordQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeClaimRecordQuery.java
@@ -18,5 +18,6 @@
@Data
@ApiModel(value = "PrizeClaimRecord鏌ヨ鍙傛暟", description = "搴楅摵鎶藉娲诲姩棰嗗彇琛ㄦ煡璇㈠弬鏁�")
public class PrizeClaimRecordQuery extends AbsQuery {
+ private String storePrizeId;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java
index 0cb71c7..4cb91e1 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java
@@ -26,7 +26,7 @@
/** 搴楅摵id */
@ApiModelProperty("搴楅摵id")
- private Long storeId;
+ private String storeId;
/** 搴楅摵鍚嶇О */
@ApiModelProperty("搴楅摵鍚嶇О")
@@ -34,7 +34,7 @@
/** 鎶藉娲诲姩id */
@ApiModelProperty("鎶藉娲诲姩id")
- private Long prizeActivityId;
+ private String prizeActivityId;
/** 鎶藉娲诲姩鍚嶇О */
@ApiModelProperty("鎶藉娲诲姩鍚嶇О")
@@ -42,7 +42,7 @@
/** 鐢ㄦ埛id */
@ApiModelProperty("鐢ㄦ埛id")
- private Long userId;
+ private String userId;
/** 鐢ㄦ埛鏄电О */
@ApiModelProperty("鐢ㄦ埛鏄电О")
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 ae006ca..e918845 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
@@ -52,6 +52,8 @@
@ApiModelProperty("鏄惁鍚敤")
private String status;
+ private String material;
+
public static ScanPrizeVO getVoByEntity(@NonNull ScanPrize entity, ScanPrizeVO vo) {
if(vo == null) {
vo = new ScanPrizeVO();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/MaterialStatusEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/MaterialStatusEnum.java
index be48e56..6c22e1d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/enums/general/MaterialStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/MaterialStatusEnum.java
@@ -4,8 +4,8 @@
@AllArgsConstructor
public enum MaterialStatusEnum {
- NOT_GENERATE("娌℃湁鐢熸垚"),
- GENERATE("鐢熸垚");
+ NOT_GENERATE("娌℃湁琛ュ厖"),
+ GENERATE("宸茶ˉ鍏�");
private String des;
diff --git a/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml
index 31743ee..05c0231 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml
@@ -54,6 +54,9 @@
lmk_prize_claim_record LPCR
WHERE
LPCR.delete_flag = 0
+ <if test="query.storePrizeId !=null and query.storePrizeId !=''">
+ AND LPCR.store_prize_id = #{query.storePrizeId}
+ </if>
</select>
</mapper>
diff --git a/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml b/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
index 6cf1790..1a489b4 100644
--- a/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml
@@ -13,6 +13,7 @@
<result column="generate_num" property="generateNum" />
<result column="claim_num" property="claimNum" />
<result column="status" property="status" />
+ <result column="material" property="material"/>
</resultMap>
@@ -49,6 +50,7 @@
LSP.generate_num,
LSP.claim_num,
LSP.status,
+ LSP.material,
LSP.id
FROM
lmk_scan_prize LSP
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java b/manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java
index 1bd0e02..c013a3d 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java
@@ -2,6 +2,8 @@
import cn.lili.group.Update;
import cn.lili.group.Add;
+import cn.lili.modules.lmk.domain.query.PrizeClaimRecordQuery;
+import cn.lili.modules.lmk.service.PrizeClaimRecordService;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;
@@ -31,7 +33,7 @@
public class ScanPrizeController {
private final ScanPrizeService scanPrizeService;
-
+ private final PrizeClaimRecordService prizeClaimRecordService;
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
@@ -95,4 +97,11 @@
public Result generateStorePrize(@PathVariable String id){
return scanPrizeService.generateStorePrize(id);
}
+
+
+ @GetMapping("/getClaimPage")
+ public Result getClaimPage(PrizeClaimRecordQuery query){
+ return prizeClaimRecordService.page(query);
+ }
+
}
--
Gitblit v1.8.0