From fe56b4374be4b40fab45cf08e38e3ccd491fdc98 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 12:08:54 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
index 97c8a19..faf9cfb 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
@@ -4,7 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.goods.api.domain.LotteryEvent;
+import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.domain.dto.*;
import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.goods.service.lottery.ILotteryEventService;
@@ -37,18 +37,15 @@
@RequestMapping(value = "/editLotteryEvent", method = RequestMethod.POST)
@Log(title = "抽奖管理", businessType = BusinessType.UPDATE,operContent = "编辑抽奖活动")
@ApiOperation(value = "平台添加/修改抽奖活动【2.0】")
- public R<ShopLotteryDrawVo> editLotteryEvent(@Valid @RequestBody MgtLotteryEventEditDTO dto) {
+ public R editLotteryEvent(@Valid @RequestBody MgtLotteryEventEditDTO dto) {
return lotteryEventService.editLotteryEvent(dto);
}
@RequestMapping(value = "/pageMgtLotteryEvent", method = RequestMethod.POST)
@ApiOperation(value = "分页获取抽奖列表【2.0】")
public R<Page<MgtLotteryEventPageVo>> pageMgtLotteryEvent(@RequestBody MgtLotteryEventPageDto dto) {
- Page<MgtLotteryEventPageVo> page = new Page<>();
- page.setSize(dto.getPageSize());
- page.setCurrent(dto.getPageNum());
- page.setOptimizeCountSql(false);
- List<MgtLotteryEventPageVo> mgtGoodsPageVoList = lotteryEventService.pageMgtLotteryEvent(page,dto);
- return R.ok(page.setRecords(mgtGoodsPageVoList));
+
+
+ return R.ok(lotteryEventService.pageMgtLotteryEvent(dto));
}
@RequestMapping(value = "/getLotteryEventDetailById/{id}", method = RequestMethod.POST)
@@ -72,7 +69,7 @@
@ApiOperation(value = "查看抽奖活动-答题情况【2.0】")
public R<Page<MgtUserAnswersPageVO>> getUserAnswersPage(@RequestBody MgtUserAnswersPageDTO dto) {
//检查是否答题类型
- LotteryEvent lotteryEvent = lotteryEventService.getById(dto.getLotteryEventId());
+ TLotteryEvent lotteryEvent = lotteryEventService.getById(dto.getLotteryEventId());
if (null == lotteryEvent || lotteryEvent.getDelFlag()!=0 ){
return R.fail("该抽奖活动不存在");
}
--
Gitblit v1.7.1