From 59d014c53f064e17f82ece90b47a0616b0ad10b4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 25 四月 2026 01:05:47 +0800
Subject: [PATCH] [fix] 活动分页列表
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
index 6852856..da591d2 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
@@ -2,19 +2,14 @@
import com.xiaopeng.api.dto.operation.XpActivityDto;
-import com.xiaopeng.api.model.operation.XpActicityCoupon;
-import com.xiaopeng.api.model.operation.XpActicityStrategy;
-import com.xiaopeng.api.model.operation.XpActivity;
-import com.xiaopeng.api.model.operation.XpCoupon;
+import com.xiaopeng.api.model.operation.*;
import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
import com.xiaopeng.api.vo.operation.XpActivityVo;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
-import com.xiaopeng.operation.service.IXpActicityCouponService;
-import com.xiaopeng.operation.service.IXpActicityService;
-import com.xiaopeng.operation.service.IXpActicityStrategyService;
+import com.xiaopeng.operation.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -98,10 +93,23 @@
IXpActicityCouponService couponService;
+ @Resource
+ IXpActicityStrategyService strategyService;
+ @Resource
+ IXpActicityUserService userService;
+ @Resource
+ IXpActivityNoticeService noticeService;
+
@PostMapping("/v1/api/appUserCoupon/pageList")
@ApiOperation(value = "活动列表",tags = {"管理后台-活动管理"},response = XpActivity.class)
- public R<PageInfo<XpActivity>> pageList(@RequestBody XpActivityPageListQuery query) {
- PageInfo<XpActivity> pageList = service.pageList(query);
+ public R<PageInfo<XpActivityDto>> pageList(@RequestBody XpActivityPageListQuery query) {
+ PageInfo<XpActivityDto> pageList = service.pageList(query);
+ for (XpActivityDto dto : pageList.getRecords()) {
+ List<XpActicityStrategy> strategies = strategyService.lambdaQuery().eq(XpActicityStrategy::getActitcityId, dto.getId()).list();
+ dto.setStrategy(strategies);
+ dto.setActivityUser(userService.lambdaQuery().eq(XpActicityUser::getActitcityId, dto.getId()).list());
+ dto.setNotice(noticeService.lambdaQuery().eq(XpActivityNotice::getActivityId, dto.getId()).one());
+ }
return R.ok(pageList);
}
--
Gitblit v1.7.1