From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
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 27bac95..5c1f347 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
@@ -1,9 +1,15 @@
package cn.lili.controller.lmk;
+import cn.lili.common.utils.StringUtils;
import cn.lili.group.Update;
import cn.lili.group.Add;
+import cn.lili.modules.lmk.domain.entity.StorePrizeProof;
import cn.lili.modules.lmk.domain.query.PrizeClaimRecordQuery;
+import cn.lili.modules.lmk.mapper.StorePrizeProofMapper;
import cn.lili.modules.lmk.service.PrizeClaimRecordService;
+import cn.lili.modules.lmk.service.StorePrizeProofService;
+import cn.lili.utils.COSUtil;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;
@@ -35,6 +41,9 @@
private final ScanPrizeService scanPrizeService;
private final PrizeClaimRecordService prizeClaimRecordService;
+ private final StorePrizeProofMapper storePrizeProofMapper;
+
+ private final COSUtil cosUtil;
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
public Result update(@RequestBody @Validated(Update.class) ScanPrizeForm form) {
@@ -56,7 +65,7 @@
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(ScanPrizeQuery query) {
- return scanPrizeService.page(query,"manager");
+ return scanPrizeService.page(query);
}
@GetMapping("/{id}")
@@ -101,7 +110,20 @@
@GetMapping("/getClaimPage")
public Result getClaimPage(PrizeClaimRecordQuery query){
- return prizeClaimRecordService.page(query);
+ return prizeClaimRecordService.page(query,"manager");
}
+ @GetMapping("/getDetailData/{id}")
+ public Result getDetailData(@PathVariable String id){
+ StorePrizeProof vo = new LambdaQueryChainWrapper<>(storePrizeProofMapper)
+ .eq(StorePrizeProof::getStorePrizeClaimId, id)
+ .eq(StorePrizeProof::getDeleteFlag, 0)
+ .one();
+
+ if (StringUtils.isNotBlank(vo.getUrlPath())) {
+ vo.setUrlPath( cosUtil.getPreviewUrl(vo.getUrlPath()));
+ }
+
+ return Result.ok().data(vo);
+ }
}
--
Gitblit v1.8.0