From af98722094615322190710a969827e724b64ba2d Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Fri, 16 May 2025 10:21:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/model/dto/ResApplyRefundDto.java | 2 +- .../payment/model/dto/ResCloseRefundDto.java | 2 +- .../payment/model/dto/ResHandleRefundDto.java | 2 +- .../payment/model/dto/ResOrderInfoDto.java | 104 ++++++++++++++++++ .../model/dto/ResProcessedRefundDto.java | 2 +- 5 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResOrderInfoDto.java diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java index cb9788a4..32830342 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; public class ResApplyRefundDto { /** - * 逐渐id + * 主键id */ private String id; diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java index f45b85fe..91e5808b 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; public class ResCloseRefundDto { /** - * 逐渐id + * 主键id */ private String id; diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java index e2abbf1c..6b0aedc6 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; public class ResHandleRefundDto { /** - * 逐渐id + * 主键id */ private String id; diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResOrderInfoDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResOrderInfoDto.java new file mode 100644 index 00000000..99009ff8 --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResOrderInfoDto.java @@ -0,0 +1,104 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author:Ding + * @ClassName:ResOrderInfoDto + * @Package:com.cdzy.payment.model.dto.ResOrderInfoDto + * @Description:订单明细dto + * @CreateDate:2025年05月15日 + * @Version: + **/ +@Data +public class ResOrderInfoDto { + + /** + * 订单金额 + */ + private BigDecimal totalAmount; + + /** + * 起步费用 + */ + private BigDecimal startupCost; + + /** + * 时长费 + */ + private BigDecimal durationCost; + + /** + * 调度费 + */ + private BigDecimal dispatchFee; + + /** + * 运营区外掉付费 + */ + private BigDecimal dispatchFeeOutOperateArea; + + /** + * 禁停区调度费 + */ + private BigDecimal dispatchFeeBanArea; + + /** + * 停车区外调度费 + */ + private BigDecimal parkingAreaOutDispatchFee; + + /** + * 头盔管理费 + */ + private BigDecimal helmetManagementFee; + + /** + * 不规范停车费 + */ + private BigDecimal improperParkFee; + + /** + * 实付金额 + */ + private BigDecimal actualAmount; + + /** + * 优惠金额 + */ + private BigDecimal discountAmount; + + /** + * 优惠卷抵扣金额 + */ + private BigDecimal couponAmount; + + /** + * 骑行卡抵扣金额 + */ + private BigDecimal cyclingCardAmount; + + /** + * 支付方式 + */ + private String payMethod; + + /** + * 用户手机与姓名 + */ + private String phoneAndUser; + + /** + * 申请原因 + */ + private String applyReason; + + /** + * 申请退款金额 + */ + private BigDecimal applyRefundAmount; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java index 7673b191..f76d9195 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; public class ResProcessedRefundDto { /** - * 逐渐id + * 主键id */ private String id; From c914e5725c1601d3f71b8342d89b15fce8d65fde Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Fri, 16 May 2025 11:19:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?dto=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/model/res/ResFeignEbikeSysRcostsetDto.java | 10 ---------- .../model/dto/request/ReqEbikeSysRcostsetDto.java | 10 ---------- .../dto/request/ReqEbikeSysRcostsetUpdateDto.java | 10 ---------- .../model/dto/response/ResEbikeSysRcostsetDto.java | 10 ---------- .../cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java | 10 ---------- 5 files changed, 50 deletions(-) diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/res/ResFeignEbikeSysRcostsetDto.java b/ebike-feign/src/main/java/com/ebike/feign/model/res/ResFeignEbikeSysRcostsetDto.java index 70425215..248ffa19 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/res/ResFeignEbikeSysRcostsetDto.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/res/ResFeignEbikeSysRcostsetDto.java @@ -83,16 +83,6 @@ public class ResFeignEbikeSysRcostsetDto { */ private BigDecimal cappedAmount; - /** - * 短期预付款 - */ - private Character shortRentAdvance; - - /** - * 是否开启长租 - */ - private Character whetherOpenLongRent; - /** * 分时段配置信息 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java index bcf6b830..32f62c2e 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java @@ -90,16 +90,6 @@ public class ReqEbikeSysRcostsetDto implements Serializable { */ private BigDecimal cappedAmount; - /** - * 短期预付款 - */ - private Character shortRentAdvance; - - /** - * 是否开启长租 - */ - private Character whetherOpenLongRent; - /** * 分时段配置信息 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java index 7507e5f6..cc5e72a6 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java @@ -93,16 +93,6 @@ public class ReqEbikeSysRcostsetUpdateDto implements Serializable { */ private BigDecimal cappedAmount; - /** - * 短期预付款 - */ - private Character shortRentAdvance; - - /** - * 是否开启长租 - */ - private Character whetherOpenLongRent; - /** * 分时段配置信息 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java index dd936496..182b9f6d 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java @@ -93,16 +93,6 @@ public class ResEbikeSysRcostsetDto implements Serializable { */ private BigDecimal cappedAmount; - /** - * 短期预付款 - */ - private Character shortRentAdvance; - - /** - * 是否开启长租 - */ - private Character whetherOpenLongRent; - /** * 分时段配置信息 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java index c3a2a365..8cdd02ab 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java @@ -100,16 +100,6 @@ public class EbikeSysRcostset implements Serializable { */ private BigDecimal cappedAmount; - /** - * 短期预付款 - */ - private Character shortRentAdvance; - - /** - * 是否开启长租 - */ - private Character whetherOpenLongRent; - /** * 创建时间 */