From 70e0e8669c318161b91bfab891d7fac2e2c8eb0e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 四月 2026 22:35:57 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 ffcecf8..6852856 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
@@ -3,6 +3,7 @@
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.query.operation.XpActivityPageListQuery;
@@ -13,6 +14,7 @@
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -45,6 +47,12 @@
@Resource
private IXpActicityService service;
+
+ @Resource
+ private IXpActicityCouponService xpActicityCouponService;
+
+ @Resource
+ private IXpActicityStrategyService xpActicityStrategyService;
/**
* 获取所有白名单手机号
@@ -143,4 +151,18 @@
}
+ /**
+ * 根据活动id和优惠券id获取活动策略
+ * @param activityId
+ * @param couponId
+ * @return
+ */
+ @PostMapping("/logan/inner/acticity/getXpActicityStrategy")
+ public R<XpActicityStrategy> getXpActicityStrategy(@RequestParam("activityId") Long activityId, @RequestParam("couponId") Long couponId){
+ XpActicityCoupon one = xpActicityCouponService.lambdaQuery().eq(XpActicityCoupon::getActivityId, activityId).eq(XpActicityCoupon::getCouponId, couponId).one();
+ if(one == null){
+ return R.ok();
+ }
+ return R.ok(xpActicityStrategyService.getById(one.getActicityStrategyId()));
+ }
}
--
Gitblit v1.7.1