From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +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/account/XpAppUserCouponClient.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpAppUserCouponClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpAppUserCouponClient.java
index daca451..af74680 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpAppUserCouponClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpAppUserCouponClient.java
@@ -3,6 +3,9 @@
import com.xiaopeng.api.dto.account.GetUserCouponDto;
import com.xiaopeng.api.dto.account.UseUserCouponDto;
import com.xiaopeng.api.factory.account.XpAppUserCouponClientFallbackFactory;
+import com.xiaopeng.api.model.account.XpAppUserCoupon;
+import com.xiaopeng.api.vo.account.AppUserCouponSaveBatchVo;
+import com.xiaopeng.api.vo.account.CalculateDiscountAmountVo;
import com.xiaopeng.api.vo.account.UserCouponVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
@@ -11,8 +14,10 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
+import java.util.List;
/**
* 小程序用户Feign客户端
@@ -27,12 +32,14 @@
@PostMapping("/logan/inner/appUserCoupon/getUserCoupon")
R<UserCouponVo> getUserCoupon(@RequestBody GetUserCouponDto dto);
+
@PostMapping("/logan/inner/appUserCoupon/useUserCoupon")
R<BigDecimal> useUserCoupon(@RequestBody UseUserCouponDto dto);
/**
* 退回用户的优惠卷
+ *
* @param dto
* @return
*/
@@ -46,11 +53,39 @@
/**
* userIds 、couponId、activityId、activityName、activityStartTime、activityEndTime、activityRemarks
+ *
* @param dto
* @return
*/
@PostMapping("/api/v1/appUserCoupon/saveInfo_activity")
@ApiOperation(value = "活动发放优惠券", tags = {"管理后台-活动发放优惠券"})
- R<String> saveInfo_activity(@RequestBody UseUserCouponDto dto) ;
+ R<String> saveInfo_activity(@RequestBody UseUserCouponDto dto);
+
+ /**
+ * 获取用户活动领取的优惠券
+ *
+ * @return
+ */
+ @PostMapping("/logan/inner/appUserCoupon/getXpAppUserCoupon")
+ R<List<XpAppUserCoupon>> getXpAppUserCoupon(@RequestParam Long activityId);
+
+
+ /**
+ * 计算优惠金额
+ *
+ * @param vo
+ * @return
+ */
+ @PostMapping("/logan/inner/appUserCoupon/calculateDiscountAmount")
+ R<BigDecimal> calculateDiscountAmount(@RequestBody CalculateDiscountAmountVo vo);
+
+
+ /**
+ * 批量保存数据
+ * @param vo
+ * @return
+ */
+ @PostMapping("/logan/inner/appUserCoupon/saveBatch")
+ R<?> saveBatch(@RequestBody AppUserCouponSaveBatchVo vo);
}
--
Gitblit v1.7.1