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-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpActicityClient.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpActicityClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpActicityClient.java
index 7a071d8..ec6218d 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpActicityClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpActicityClient.java
@@ -2,6 +2,7 @@
 
 
 import com.xiaopeng.api.factory.operation.XpCouponClientFallbackFactory;
+import com.xiaopeng.api.model.operation.XpActicityStrategy;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -19,4 +20,16 @@
 
     @PostMapping("/logan/inner/acticity/findListToIds")
     R<List<String>> findListToIds(@RequestParam("acticityName") String acticityName);
+
+
+
+    /**
+     * 根据活动id和优惠券id获取活动策略
+     * @param activityId
+     * @param couponId
+     * @return
+     */
+    @PostMapping("/logan/inner/acticity/getXpActicityStrategy")
+    R<XpActicityStrategy> getXpActicityStrategy(@RequestParam("activityId") Long activityId, @RequestParam("couponId") Long couponId);
+
 }

--
Gitblit v1.7.1