diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignEbikeRefundOrderDetailVo.java b/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignEbikeRefundOrderDetailVo.java index dc179f2..5cfda13 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignEbikeRefundOrderDetailVo.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignEbikeRefundOrderDetailVo.java @@ -99,6 +99,11 @@ public class FeignEbikeRefundOrderDetailVo { */ private BigDecimal helmetManagementFee; + /** + * 优惠费用 + */ + private BigDecimal discountAmount; + /** * 退款申请类型 */ diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrderDetail.java b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrderDetail.java index 4ecad64..e1f42db 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrderDetail.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrderDetail.java @@ -44,7 +44,7 @@ public class EbikeOrderDetail implements Serializable { private Long operatorId; /** - * 费用类型:1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 + * 费用类型:1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用 */ private Integer detailType; diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/vo/EbikePaymentCostDetailVo.java b/ebike-payment/src/main/java/com/cdzy/payment/model/vo/EbikePaymentCostDetailVo.java index 4905162..a975e8d 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/vo/EbikePaymentCostDetailVo.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/vo/EbikePaymentCostDetailVo.java @@ -24,7 +24,7 @@ public class EbikePaymentCostDetailVo implements Serializable { private Long detailId; /** - * 费用类型 1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 + * 费用类型 1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用 */ private Integer detailType; diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java index ef8067c..6e68219 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java @@ -673,7 +673,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl details) { if (!CollectionUtils.isEmpty(details)) { for (EbikePaymentCostDetailVo payDetailVo : details) { - //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 + //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用 switch (payDetailVo.getDetailType()) { case 1 -> { BigDecimal current = payDetailVo.getDetailAmount(); diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java index 46391f7..39b70c6 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java @@ -179,7 +179,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl details = orderDetailService.getOrderDetailsByOrderId(detailVo.getOrderId()); if (Objects.nonNull(details)) { for (EbikePaymentCostDetailVo payDetailVo : details) { - //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 + //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用 switch (payDetailVo.getDetailType()) { case 1 -> { BigDecimal current = payDetailVo.getDetailAmount(); @@ -205,6 +205,11 @@ public class EbikeRefundServiceImpl extends ServiceImpl { + BigDecimal current = payDetailVo.getDetailAmount(); + detailVo.setDiscountAmount((current != null ? current : BigDecimal.ZERO)); + } } } } @@ -443,7 +448,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl details = orderDetailService.getOrderDetailsByOrderId(orderId); if (details != null && !details.isEmpty()) { for (EbikePaymentCostDetailVo detailVo : details) { - //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 + //1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用 switch (detailVo.getDetailType()) { case 1 -> detailInfo.setDurationFee( Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO)); @@ -457,6 +462,8 @@ public class EbikeRefundServiceImpl extends ServiceImpl detailInfo.setHelmetManagementFee( Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO)); + case 7 -> detailInfo.setDiscountAmount( + Optional.ofNullable(detailVo.getDetailAmount()).orElse(BigDecimal.ZERO)); } } }