From 7ec17b93b34a060233e5f193fa47fa243f7efafc Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期四, 28 八月 2025 01:07:52 +0800 Subject: [PATCH] 导出以及页面 --- buyer-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java | 27 +++++++++ framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java | 21 ++++++ framework/src/main/java/cn/lili/modules/lmk/service/PrizeRecordService.java | 2 framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml | 22 +++++++ framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java | 25 ++++++- framework/src/main/java/cn/lili/modules/lmk/mapper/PrizeRecordMapper.java | 2 framework/src/main/java/cn/lili/modules/lmk/service/PrizeActivityService.java | 7 ++ buyer-api/src/main/java/cn/lili/controller/lmk/PrizeRecordController.java | 29 +++++++++ 8 files changed, 129 insertions(+), 6 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java new file mode 100644 index 0000000..172e3c3 --- /dev/null +++ b/buyer-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java @@ -0,0 +1,27 @@ +package cn.lili.controller.lmk; + + +import cn.lili.base.Result; +import cn.lili.modules.lmk.service.PrizeActivityService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * lmk-shop-java + * + * @author : zxl + * @date : 2025-08-27 22:22 + **/ +@RestController +@RequestMapping("/buyer/lmk/activity-prize") +@RequiredArgsConstructor +public class PrizeActivityController { + private final PrizeActivityService prizeActivityService; + + @GetMapping("/getONPrizeActivity") + public Result getONPrizeActivity(){ + return prizeActivityService.getONPrizeActivity(); + } +} diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/PrizeRecordController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/PrizeRecordController.java new file mode 100644 index 0000000..7825605 --- /dev/null +++ b/buyer-api/src/main/java/cn/lili/controller/lmk/PrizeRecordController.java @@ -0,0 +1,29 @@ +package cn.lili.controller.lmk; + + +import cn.lili.base.Result; +import cn.lili.modules.lmk.domain.query.PrizeRecordQuery; +import cn.lili.modules.lmk.service.PrizeActivityService; +import cn.lili.modules.lmk.service.PrizeRecordService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * lmk-shop-java + * + * @author : zxl + * @date : 2025-08-27 22:22 + **/ +@RestController +@RequestMapping("/buyer/lmk/prizeRecord") +@RequiredArgsConstructor +public class PrizeRecordController { + private final PrizeRecordService prizeRecordService; + + @GetMapping + public Result getPage(PrizeRecordQuery query){ + return prizeRecordService.pageByUserId(query); + } +} diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/PrizeRecordMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/PrizeRecordMapper.java index 43cea81..73fe607 100644 --- a/framework/src/main/java/cn/lili/modules/lmk/mapper/PrizeRecordMapper.java +++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/PrizeRecordMapper.java @@ -34,6 +34,8 @@ */ IPage getPage(IPage page, @Param("query") PrizeRecordQuery query); + IPage getByUserIdPage(IPage page, @Param("query") PrizeRecordQuery query,@Param("userId") String userId); + List<PrizeRecordTimeVO> getPrizeRecordListByTime(@Param("query") PrizeRecordTimeQuery query); List<PrizeRecordVO> getExportData(@Param("query")PrizeRecordQuery query); diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/PrizeActivityService.java b/framework/src/main/java/cn/lili/modules/lmk/service/PrizeActivityService.java index 24abac8..80e0a43 100644 --- a/framework/src/main/java/cn/lili/modules/lmk/service/PrizeActivityService.java +++ b/framework/src/main/java/cn/lili/modules/lmk/service/PrizeActivityService.java @@ -17,6 +17,13 @@ */ public interface PrizeActivityService extends IService<PrizeActivity> { + + /** + * 鑾峰緱鎵撳紑鐨勬娊濂栨椿鍔� + * @return + */ + Result getONPrizeActivity(); + Result getPopup(); /** * 璁剧疆寮圭獥娲诲姩 diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/PrizeRecordService.java b/framework/src/main/java/cn/lili/modules/lmk/service/PrizeRecordService.java index de3cdb6..b263591 100644 --- a/framework/src/main/java/cn/lili/modules/lmk/service/PrizeRecordService.java +++ b/framework/src/main/java/cn/lili/modules/lmk/service/PrizeRecordService.java @@ -57,6 +57,8 @@ */ Result page(PrizeRecordQuery query); + Result pageByUserId(PrizeRecordQuery query); + /** * 鏍规嵁id鏌ユ壘 * @param id diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java index 9ca5f23..4351b3d 100644 --- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java @@ -17,8 +17,6 @@ import cn.lili.modules.lmk.domain.form.PrizeActivityForm; import cn.lili.modules.lmk.domain.vo.PrizeActivityVO; import cn.lili.modules.lmk.domain.query.PrizeActivityQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; import cn.lili.utils.PageUtil; @@ -46,6 +44,21 @@ private final COSUtil cOSUtil; + @Override + public Result getONPrizeActivity(){ + PrizeActivity prizeActivity = new LambdaQueryChainWrapper<>(baseMapper) + .eq(PrizeActivity::getDeleteFlag,Boolean.FALSE) + .eq(PrizeActivity::getEnableStatus,PrizeActivityStatusEnum.ON.name()) + .one(); + PrizeActivityVO prizeActivityVO = new PrizeActivityVO(); + if (prizeActivity != null){ + PrizeActivityVO vo = PrizeActivityVO.getVoByEntity(prizeActivity, prizeActivityVO); + if (StringUtils.isNotBlank(vo.getActivityCover())){ + vo.setActivityCoverUrl(cOSUtil.getPreviewUrl(vo.getActivityCover())); + } + } + return Result.ok().data(prizeActivityVO); + } @Override public Result getPopup() { @@ -55,9 +68,11 @@ .eq(PrizeActivity::getPopup,Boolean.TRUE) .one(); PrizeActivityVO prizeActivityVO = new PrizeActivityVO(); - PrizeActivityVO vo = PrizeActivityVO.getVoByEntity(prizeActivity, prizeActivityVO); - if (StringUtils.isNotBlank(vo.getActivityCover())){ - vo.setActivityCoverUrl(cOSUtil.getPreviewUrl(vo.getActivityCover())); + if (prizeActivity != null){ + PrizeActivityVO vo = PrizeActivityVO.getVoByEntity(prizeActivity, prizeActivityVO); + if (StringUtils.isNotBlank(vo.getActivityCover())){ + vo.setActivityCoverUrl(cOSUtil.getPreviewUrl(vo.getActivityCover())); + } } return Result.ok().data(prizeActivityVO); } diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java index b8cdd6e..5b28dcf 100644 --- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeRecordServiceImpl.java @@ -1,7 +1,7 @@ package cn.lili.modules.lmk.service.impl; +import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.lmk.domain.query.PrizeGrantRecordQuery; import cn.lili.modules.lmk.domain.query.PrizeRecordTimeQuery; import cn.lili.modules.lmk.domain.vo.PrizeRecordTimeVO; import cn.lili.modules.lmk.enums.general.PrizeDistributeStatusEnum; @@ -188,6 +188,25 @@ } return Result.ok().data(page.getRecords()).total(page.getTotal()); } + @Override + public Result pageByUserId(PrizeRecordQuery query) { + String userId = UserContext.getCurrentUser().getId(); + IPage<PrizeRecordVO> page = PageUtil.getPage(query, PrizeRecordVO.class); + if (StringUtils.isNotBlank(userId)){ + baseMapper.getByUserIdPage(page, query, userId); + for (PrizeRecordVO vo :page.getRecords()){ + if (StringUtils.isNotBlank(vo.getPrizeActivityCover())){ + vo.setPrizeActivityCoverUrl(cosUtil.getPreviewUrl(vo.getPrizeActivityCover())); + } + if (StringUtils.isNotBlank(vo.getPrizeImg())){ + vo.setPrizeImgUrl(cosUtil.getPreviewUrl(vo.getPrizeImg())); + } + } + + } + return Result.ok().data(page.getRecords()).total(page.getTotal()); + + } /** * 鏍规嵁id鏌ユ壘 diff --git a/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml index 9dda94e..4d42fa5 100644 --- a/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml +++ b/framework/src/main/resources/mapper/lmk/PrizeRecordMapper.xml @@ -80,6 +80,28 @@ AND LPR.distribute_status = #{query.distributeStatus} </if> </select> + <select id="getByUserIdPage" resultMap="BaseResultMap"> + SELECT + LPR.user_id, + LPR.nick_name, + LPR.prize_activity_id, + LPR.prize_activity_name, + LPR.prize_activity_cover, + LPR.prize_status, + LPR.prize_content, + LPR.prize_id, + LPR.prize_img, + LPR.prize_num_id, + LPR.activity_prize_ref_id, + LPR.distribute_status, + LPR.id, + LPR.create_time + FROM + lmk_prize_record LPR + WHERE + LPR.delete_flag = 0 + AND LPR.user_id = #{userId} + </select> <select id="getExportData" resultMap="BaseResultMap"> SELECT LPR.user_id, -- Gitblit v1.8.0