退款申请列表查询接口增加查询字段

ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java

@@ -79,7 +79,8 @@ public class ResApplyRefundDto {
     /**
      * 骑行设备编号
      */
-    private String ebikeCode;;
+    private String ebikeCode;
+    ;
 
     /**
      * 骑行开始时间
@@ -91,4 +92,14 @@ public class ResApplyRefundDto {
      */
     private LocalDateTime endTime;
 
+    /**
+     * 骑点坐标
+     */
+    private String ridePoint;
+
+    /**
+     * 还车坐标
+     */
+    private String returnPoint;
+
 }

ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java

@@ -89,7 +89,8 @@ public class ResCloseRefundDto {
     /**
      * 骑行设备编号
      */
-    private String ebikeCode;;
+    private String ebikeCode;
+    ;
 
     /**
      * 骑行开始时间
@@ -101,4 +102,14 @@ public class ResCloseRefundDto {
      */
     private LocalDateTime endTime;
 
+    /**
+     * 骑点坐标
+     */
+    private String ridePoint;
+
+    /**
+     * 还车坐标
+     */
+    private String returnPoint;
+
 }

ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java

@@ -96,4 +96,13 @@ public class ResHandleRefundDto {
      */
     private LocalDateTime endTime;
 
+    /**
+     * 骑点坐标
+     */
+    private String ridePoint;
+
+    /**
+     * 还车坐标
+     */
+    private String returnPoint;
 }

ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java

@@ -121,4 +121,13 @@ public class ResProcessedRefundDto {
      */
     private LocalDateTime endTime;
 
+    /**
+     * 骑点坐标
+     */
+    private String ridePoint;
+
+    /**
+     * 还车坐标
+     */
+    private String returnPoint;
 }

ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java

@@ -93,7 +93,8 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
                         EBIKE_PAYMENT.PAYMENT_TIME.as("pay_time"), EBIKE_REFUND.REASON.as("apply_reason"),
                         QueryMethods.case_(EBIKE_REFUND.SOURCE).when("0").then("用户")
                                 .when("1").then("客服").end().as("source"), EBIKE_USER.NICKNAME.as("applicant"),
-                        EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"),EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time")
+                        EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"), EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time"),
+                        EBIKE_USER_ORDERS.RIDE_POINT, EBIKE_USER_ORDERS.RETURN_POINT
                 )
                 .leftJoin(EBIKE_PAYMENT).on(EBIKE_PAYMENT.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID))
                 .leftJoin(EBIKE_USER).on(EBIKE_USER.USER_ID.eq(EBIKE_PAYMENT.USER_ID))
@@ -128,7 +129,8 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
                         EBIKE_PAYMENT.PAYMENT_TIME.as("pay_time"), EBIKE_REFUND.REASON.as("apply_reason"),
                         QueryMethods.case_(EBIKE_REFUND.SOURCE).when("0").then("用户")
                                 .when("1").then("客服").end().as("source"), EBIKE_USER.NICKNAME.as("applicant"),
-                        EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"),EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time")
+                        EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"), EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time"),
+                        EBIKE_USER_ORDERS.RIDE_POINT, EBIKE_USER_ORDERS.RETURN_POINT
                 )
                 .leftJoin(EBIKE_PAYMENT).on(EBIKE_PAYMENT.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID))
                 .leftJoin(EBIKE_USER).on(EBIKE_USER.USER_ID.eq(EBIKE_PAYMENT.USER_ID))
@@ -168,7 +170,8 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
                         EBIKE_PAYMENT.PAYMENT_TIME.as("pay_time"), EBIKE_REFUND.REASON.as("apply_reason"),
                         QueryMethods.case_(EBIKE_REFUND.SOURCE).when("0").then("用户")
                                 .when("1").then("客服").end().as("source"), EBIKE_USER.NICKNAME.as("applicant"),
-                       EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"),EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time")
+                        EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"), EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time"),
+                        EBIKE_USER_ORDERS.RIDE_POINT, EBIKE_USER_ORDERS.RETURN_POINT
                 )
                 .leftJoin(EBIKE_PAYMENT).on(EBIKE_PAYMENT.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID))
                 .leftJoin(EBIKE_USER).on(EBIKE_USER.USER_ID.eq(EBIKE_PAYMENT.USER_ID))
@@ -200,7 +203,8 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
                         EBIKE_PAYMENT.PAYMENT_TIME.as("pay_time"), EBIKE_REFUND.REASON.as("apply_reason"),
                         QueryMethods.case_(EBIKE_REFUND.SOURCE).when("0").then("用户")
                                 .when("1").then("客服").end().as("source"), EBIKE_USER.NICKNAME.as("applicant"),
-                      EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"),EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time")
+                        EBIKE_USER_ORDERS.BIKE_CODE.as("ebike_code"), EBIKE_USER_ORDERS.START_TIME.as("start_time"), EBIKE_USER_ORDERS.END_TIME.as("end_time"),
+                        EBIKE_USER_ORDERS.RIDE_POINT, EBIKE_USER_ORDERS.RETURN_POINT
                 )
                 .leftJoin(EBIKE_PAYMENT).on(EBIKE_PAYMENT.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID))
                 .leftJoin(EBIKE_USER).on(EBIKE_USER.USER_ID.eq(EBIKE_PAYMENT.USER_ID))