From 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 23:38:59 +0800
Subject: [PATCH] bug：统计数据修正
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index 047b47c..1657b06 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -232,6 +232,7 @@
couponListVo.setType(type);
couponListVo.setEffectiveTime(userCoupon.get("endTime").toString());
String content = userCoupon.get("content").toString();
+ BigDecimal orderAmount = BigDecimal.valueOf(price == null ? 0D : price).max(BigDecimal.ZERO);
if (type == 1) {//满减{"num1":1,"num2":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("conditionalAmount");
@@ -240,6 +241,10 @@
}
couponListVo.setUseCondition("满" + num1 + "元可用");
couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
+ BigDecimal discount = BigDecimal.valueOf(jsonObject.getDouble("deductionAmount"))
+ .min(orderAmount);
+ couponListVo.setDiscountAmount(discount);
+ couponListVo.setPayableAmount(orderAmount.subtract(discount));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -247,11 +252,12 @@
if (num1 == null) {
num1 = 0d;
}
- if (price.compareTo(num1) < 0) {
- continue;
- }
+ // 代金券可全额抵扣，面额超过订单金额时按订单金额抵扣，不应从列表中剔除。
couponListVo.setUseCondition("");
couponListVo.setFavorable(num1 + "");
+ BigDecimal discount = BigDecimal.valueOf(num1).max(BigDecimal.ZERO).min(orderAmount);
+ couponListVo.setDiscountAmount(discount);
+ couponListVo.setPayableAmount(orderAmount.subtract(discount));
}
if (type == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
--
Gitblit v1.7.1