diff --git a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java index ecb20a3..8f5571f 100644 --- a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java +++ b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java @@ -16,7 +16,8 @@ public enum EbikeOrderDetailType { OPERATION_AREA_DISPATCH_FEE(3, "运营区调度费用"), OUT_OF_PARKING_AREA_FEE(4, "停车区外调度费用"), NO_PARKING_ZONE_FEE(5, "禁停区调度费用"), - HELMET_FEE(6, "头盔使用费用"); + HELMET_FEE(6, "头盔使用费用"), + DISCOUNT_AMOUNT(7, "订单优惠金额"); private final Integer code; private final String name; diff --git a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java index 4e97a6d..f97c2d5 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java +++ b/ebike-user/src/main/java/com/cdzy/user/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-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java index 0544a1e..eccd7b6 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java @@ -194,4 +194,9 @@ public class EbikeOrderDetailVo { * 用户头盔费用 */ private BigDecimal userHelmetFee; + + /** + * 优惠费用 + */ + private BigDecimal discountAmount; } diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java index 3d1ab2d..b3aa09d 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java +++ b/ebike-user/src/main/java/com/cdzy/user/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 a8ce533..0f29f4a 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 @@ -187,6 +187,10 @@ public class EbikeOrderServiceImpl extends ServiceImpl { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setDiscountAmount((current != null ? current : BigDecimal.ZERO)); + } } } } @@ -394,6 +398,10 @@ public class EbikeOrderServiceImpl extends ServiceImpl { + BigDecimal current = payDetailVo.getDetailAmount(); + ebikeOrderDetailVo.setDiscountAmount((current != null ? current : BigDecimal.ZERO)); + } } } } @@ -441,6 +449,16 @@ public class EbikeOrderServiceImpl extends ServiceImpl