From bb671486066976fa67477ed71d1d424a6ee4e012 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 21:51:33 +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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 9c00a0a..5ae313b 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.XpActicityCoupon;
import com.xiaopeng.api.model.operation.XpActivity;
import com.xiaopeng.api.model.operation.XpCoupon;
import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
@@ -10,6 +11,7 @@
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -67,23 +69,26 @@
* @return 活动信息，id 和 img
*/
@PostMapping("/logan/inner/acticity/firstEnter")
- @ApiOperation(value = "获取活动信息ids", tags = {"管理后台-活动首次进入情况"})
- public R<XpActivity> firstEnter(HttpServletRequest request){
+ @ApiOperation(value = "获取是否第一次推送活动", tags = {"管理后台-活动首次进入情况"})
+ public R<XpActivityVo> firstEnter(HttpServletRequest request){
String uid = request.getHeader("XP-Uid");
ValueOperations<String, String> ops = redisTemplate.opsForValue();
XpActivity activity = service.activiting();
+ List<XpActicityCoupon> cps = couponService.lambdaQuery().eq(XpActicityCoupon::getActivityId, activity.getId()).list();
XpActivityVo ret = new XpActivityVo();
if (activity !=null) {
BeanUtils.copyBeanProp(ret, activity);
Duration duration = Duration.between(LocalDateTime.now(), activity.getEndTime());
Boolean isFirst = ops.setIfAbsent(CacheConstants.firstEnterActivity(String.valueOf(activity.getId()), uid),"1", duration);
ret.setIsFirst(isFirst);
+ ret.setCoupons(cps);
}
- return R.ok(activity);
+ return R.ok(ret);
}
+ IXpActicityCouponService couponService;
@PostMapping("/v1/api/appUserCoupon/pageList")
@ApiOperation(value = "活动列表",tags = {"管理后台-活动管理"},response = XpActivity.class)
--
Gitblit v1.7.1