diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java index c28172d..72814ce 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java @@ -99,6 +99,11 @@ public class FeignEbikeUserBikeInfo implements Serializable { */ private BigDecimal helmetManagementFee; + /** + * 订单预付金额 + */ + private BigDecimal prepaidAmount; + /** * 车辆运营区 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java index 888be83..8ea4c8e 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java @@ -108,6 +108,11 @@ public class EbikeUserBikeInfo implements Serializable { */ private BigDecimal helmetManagementFee; + /** + * 订单预付金额 + */ + private BigDecimal prepaidAmount; + /** * 运营区域 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDefaultBillingConfiguration.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDefaultBillingConfiguration.java index 3a9a9c3..3085332 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDefaultBillingConfiguration.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDefaultBillingConfiguration.java @@ -87,6 +87,11 @@ public class EbikeDefaultBillingConfiguration implements Serializable { */ private BigDecimal helmetManagementFee; + /** + * 订单预付金额 + */ + private BigDecimal prepaidAmount; + /** * 记录创建时间 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeDefaultBillingConfigurationVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeDefaultBillingConfigurationVo.java index 9024a34..62a0c01 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeDefaultBillingConfigurationVo.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbikeDefaultBillingConfigurationVo.java @@ -102,4 +102,11 @@ public class EbikeDefaultBillingConfigurationVo implements Serializable { @Min(value = 0, message = "头盔管理费不能小于0") private BigDecimal helmetManagementFee; + + /** + * 订单预付金额 + */ + @NotNull(message = "订单预付金额不能为空") + @Min(value = 0, message = "订单预付金额不能小于0") + private BigDecimal prepaidAmount; } \ No newline at end of file diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index c5fb255..0814ca7 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -485,6 +485,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl