From 2aa8fe3c4cb92c83ba886f0d08b76e98f0dc4de6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 26 四月 2026 10:16:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 1cc60b4..ea82e80 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,6 +2,7 @@
import com.xiaopeng.api.dto.operation.XpActivityDto;
+import com.xiaopeng.api.model.operation.*;
import com.xiaopeng.api.feignClient.account.XpAppUserCouponClient;
import com.xiaopeng.api.model.account.XpAppUserCoupon;
import com.xiaopeng.api.model.operation.XpActicityCoupon;
@@ -13,6 +14,7 @@
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.operation.service.*;
import com.xiaopeng.operation.service.IXpActicityCouponService;
import com.xiaopeng.operation.service.IXpActicityService;
import com.xiaopeng.operation.service.IXpActicityStrategyService;
@@ -143,10 +145,23 @@
+ @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