From f4b822cebac64a9ba556b76af5e20a239fe52a2d Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 6 Jun 2024 14:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/user/response/UserCalculateOrderFeeVo.java | 6 ++++++ .../application/service/order/OrderApplicationService.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java index de43275..afb8ac8 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/response/UserCalculateOrderFeeVo.java @@ -15,6 +15,12 @@ public class UserCalculateOrderFeeVo { @ApiModelProperty("原价") private BigDecimal unitOriginalPrice; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + + @ApiModelProperty("助力金额") + private BigDecimal assistanceFee; + @ApiModelProperty("结算单价") private BigDecimal unitSettlementPrice; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index e0acf78..ac58d9d 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -333,6 +333,7 @@ public class OrderApplicationService extends BaseApplicationService { if (calculateVo.getUnitOriginalPrice().compareTo(BigDecimal.ZERO) <= 0) { throw new BizException("下单异常"); } - return new UserCalculateOrderFeeVo(calculateVo.getUnitOriginalPrice(), calculateVo.getUnitSettlementPrice()); + return new UserCalculateOrderFeeVo(calculateVo.getUnitOriginalPrice(), calculateVo.getDiscountAmount(), + calculateVo.getAssistanceFee(), calculateVo.getUnitSettlementPrice()); } }