Merge remote-tracking branch 'origin/main'

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;
-
     /**
      * 分时段配置信息
      */

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;
-
     /**
      * 分时段配置信息
      */

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;
-
     /**
      * 分时段配置信息
      */

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;
-
     /**
      * 分时段配置信息
      */

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;
-
     /**
      * 创建时间
      */

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;
 

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;
 

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;
 

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;
+
+}

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;