From 2c2392f477eaa64b16e637e442957044757c90eb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 四月 2026 18:57:34 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
index 0da0236..6bccff5 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
@@ -25,6 +25,7 @@
 import com.xiaopeng.api.model.account.XpAppUserCoupon;
 import com.xiaopeng.api.model.operation.XpCoupon;
 import com.xiaopeng.api.query.account.XpAppUserCouponPageListQuery;
+import com.xiaopeng.api.vo.account.CalculateDiscountAmountVo;
 import com.xiaopeng.api.vo.account.NavigationCouponPickerVo;
 import com.xiaopeng.api.vo.account.UserCouponVo;
 import com.xiaopeng.common.core.domain.R;
@@ -154,6 +155,8 @@
         }
 
     }
+
+
     @PostMapping("/logan/inner/appUserCoupon/useUserCoupon")
     public R<BigDecimal> useUserCoupon(@RequestBody UseUserCouponDto dto) {
         XpAppUserCoupon appUserCoupon = xpAppUserCouponService.getById(dto.getUserCouponId());
@@ -390,5 +393,14 @@
     }
 
 
-
+    /**
+     * 计算优惠金额
+     * @param vo
+     * @return
+     */
+    @PostMapping("/logan/inner/appUserCoupon/calculateDiscountAmount")
+    public R<BigDecimal> calculateDiscountAmount(@RequestParam CalculateDiscountAmountVo vo){
+        BigDecimal bigDecimal = xpAppUserCouponService.calculateDiscountAmount(vo);
+        return R.ok(bigDecimal);
+    }
 }

--
Gitblit v1.7.1