From fd3ae2fd3c9bd414a589f619a8221c73989fc58b Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Tue, 20 May 2025 14:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/model/dto/ResApplyRefundDto.java | 13 +- .../payment/model/dto/ResCloseRefundDto.java | 13 +- .../payment/model/dto/ResHandleRefundDto.java | 9 ++ .../model/dto/ResProcessedRefundDto.java | 9 ++ .../service/impl/EbikeRefundServiceImpl.java | 120 +++++++++--------- 5 files changed, 104 insertions(+), 60 deletions(-) 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 e09e1166..5ee2404a 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 @@ -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; + } 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 83211bb6..9d49de44 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 @@ -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; + } 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 1d83acdc..e34e9bfd 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 @@ -96,4 +96,13 @@ public class ResHandleRefundDto { */ private LocalDateTime endTime; + /** + * 骑点坐标 + */ + private String ridePoint; + + /** + * 还车坐标 + */ + private String returnPoint; } 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 5b9e190e..eefeeee6 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 @@ -121,4 +121,13 @@ public class ResProcessedRefundDto { */ private LocalDateTime endTime; + /** + * 骑点坐标 + */ + private String ridePoint; + + /** + * 还车坐标 + */ + private String returnPoint; } diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java index 0ec226c1..aa0f96e9 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java @@ -32,7 +32,7 @@ import static com.mybatisflex.core.constant.FuncName.*; * @since 2025-04-25 */ @Service -public class EbikeRefundServiceImpl extends ServiceImpl implements EbikeRefundService{ +public class EbikeRefundServiceImpl extends ServiceImpl implements EbikeRefundService { @Resource private OrdersFeignClient ordersFeignClient; @@ -41,7 +41,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl getApplyingList(ReqRefundQueryDto refundDto) { QueryWrapper query = QueryWrapper.create() .select(EBIKE_REFUND.REFUND_ID.as("id"), EBIKE_REFUND.CREATE_TIME.as("apply_time"), EBIKE_USER.MOBILE.as("phone"), - EBIKE_REFUND.ORDER_ID.as("cycling_order_number"), EBIKE_REFUND.REFUND_APPLY.as("apply_refund_amount"), + EBIKE_REFUND.ORDER_ID.as("cycling_order_number"), EBIKE_REFUND.REFUND_APPLY.as("apply_refund_amount"), EBIKE_PAYMENT.TOTAL.as("actual_pay_amount"), QueryMethods.case_(EBIKE_PAYMENT.PAYMENT_METHOD) .when(PayMethod.wechat.name()).then("微信支付") .when(PayMethod.alipay.name()).then("支付宝") .when(PayMethod.balance.name()).then("余额").end().as("pay_method"), - EBIKE_PAYMENT.PAYMENT_TIME.as("pay_time"), EBIKE_REFUND.REASON.as("apply_reason"), + 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)) .leftJoin(EBIKE_USER_ORDERS).on(EBIKE_USER_ORDERS.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID)) - .where(EBIKE_REFUND.PROCESS_STATE.eq(String.valueOf(applying.ordinal()))); - if(refundDto.getPhone() != null && !refundDto.getPhone().isEmpty()) + .where(EBIKE_REFUND.PROCESS_STATE.eq(String.valueOf(applying.ordinal()))); + if (refundDto.getPhone() != null && !refundDto.getPhone().isEmpty()) query.and(EBIKE_USER.MOBILE.like(refundDto.getPhone())); - if(refundDto.getCyclingOrderNumber()!= null &&!refundDto.getCyclingOrderNumber().isEmpty()) + if (refundDto.getCyclingOrderNumber() != null && !refundDto.getCyclingOrderNumber().isEmpty()) query.and(EBIKE_REFUND.ORDER_ID.like(refundDto.getCyclingOrderNumber())); - if(refundDto.getRefundTime()!=null&&!refundDto.getRefundTime().isEmpty()){ + if (refundDto.getRefundTime() != null && !refundDto.getRefundTime().isEmpty()) { query.and(EBIKE_REFUND.REFUND_TIME.ge(refundDto.getRefundTime().get(0))); - if(refundDto.getRefundTime().size()==2) + if (refundDto.getRefundTime().size() == 2) query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1))); } Page page = refundDto.getPageParam().getPage(); @@ -122,25 +123,26 @@ public class EbikeRefundServiceImpl extends ServiceImpl page = refundDto.getPageParam().getPage(); @@ -150,37 +152,38 @@ public class EbikeRefundServiceImpl extends ServiceImpl getProcessedList(ReqRefundQueryDto refundDto) { QueryWrapper query = QueryWrapper.create() - .select(EBIKE_REFUND.REFUND_ID.as("id"), EBIKE_REFUND.CREATE_TIME.as("apply_time"), EBIKE_USER.MOBILE.as("phone"), + .select(EBIKE_REFUND.REFUND_ID.as("id"), EBIKE_REFUND.CREATE_TIME.as("apply_time"), EBIKE_USER.MOBILE.as("phone"), EBIKE_REFUND.ORDER_ID.as("cycling_order_number"), EBIKE_PAYMENT.TOTAL.as("actual_pay_amount"), - QueryMethods.case_(EBIKE_REFUND.STATUS).when(String.valueOf(Status.SUCCESS.ordinal())).then("退款成功") - .when(String.valueOf(Status.PROCESSING.ordinal())).then("退款中") + QueryMethods.case_(EBIKE_REFUND.STATUS).when(String.valueOf(Status.SUCCESS.ordinal())).then("退款成功") + .when(String.valueOf(Status.PROCESSING.ordinal())).then("退款中") .when(String.valueOf(Status.ABNORMAL.ordinal())).then("退款异常") - .when(String.valueOf(Status.CLOSED.ordinal())).then("退款终止").end().as("arrived_state"), - EBIKE_REFUND.REFUND_TIME.as("arrived_time"),EBIKE_REFUND.REFUND_TRANSACTION_ID.as("trade_serial_number"), - QueryMethods.case_(EBIKE_PAYMENT.PAYMENT_METHOD) - .when(PayMethod.wechat.name()).then("微信支付") - .when(PayMethod.alipay.name()).then("支付宝") - .when(PayMethod.balance.name()).then("余额").end().as("pay_method"), + .when(String.valueOf(Status.CLOSED.ordinal())).then("退款终止").end().as("arrived_state"), + EBIKE_REFUND.REFUND_TIME.as("arrived_time"), EBIKE_REFUND.REFUND_TRANSACTION_ID.as("trade_serial_number"), + QueryMethods.case_(EBIKE_PAYMENT.PAYMENT_METHOD) + .when(PayMethod.wechat.name()).then("微信支付") + .when(PayMethod.alipay.name()).then("支付宝") + .when(PayMethod.balance.name()).then("余额").end().as("pay_method"), EBIKE_REFUND.REFUND.as("refund_amount"), QueryMethods.case_(EBIKE_REFUND.REFUND_METHOD) - .when("0").then("原路返回") - .when("1").then("余额退款") - .when("2").then("线下退款").end().as("refund_method"), + .when("0").then("原路返回") + .when("1").then("余额退款") + .when("2").then("线下退款").end().as("refund_method"), 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") + .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.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)) + .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)) .leftJoin(EBIKE_USER_ORDERS).on(EBIKE_USER_ORDERS.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID)) - .where(EBIKE_REFUND.PROCESS_STATE.eq(String.valueOf(processed.ordinal()))); - if(refundDto.getPhone() != null && !refundDto.getPhone().isEmpty()) + .where(EBIKE_REFUND.PROCESS_STATE.eq(String.valueOf(processed.ordinal()))); + if (refundDto.getPhone() != null && !refundDto.getPhone().isEmpty()) query.and(EBIKE_USER.MOBILE.like(refundDto.getPhone())); - if(refundDto.getCyclingOrderNumber()!= null &&!refundDto.getCyclingOrderNumber().isEmpty()) + if (refundDto.getCyclingOrderNumber() != null && !refundDto.getCyclingOrderNumber().isEmpty()) query.and(EBIKE_REFUND.ORDER_ID.like(refundDto.getCyclingOrderNumber())); - if(refundDto.getRefundTime()!=null&&!refundDto.getRefundTime().isEmpty()){ + if (refundDto.getRefundTime() != null && !refundDto.getRefundTime().isEmpty()) { query.and(EBIKE_REFUND.REFUND_TIME.ge(refundDto.getRefundTime().get(0))); - if(refundDto.getRefundTime().size()==2) + if (refundDto.getRefundTime().size() == 2) query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1))); } Page page = refundDto.getPageParam().getPage(); @@ -190,29 +193,30 @@ public class EbikeRefundServiceImpl extends ServiceImpl getClosedList(ReqRefundQueryDto refundDto) { QueryWrapper query = QueryWrapper.create() - .select(EBIKE_REFUND.REFUND_ID.as("id"), EBIKE_REFUND.CREATE_TIME.as("apply_time"), EBIKE_USER.MOBILE.as("phone"), + .select(EBIKE_REFUND.REFUND_ID.as("id"), EBIKE_REFUND.CREATE_TIME.as("apply_time"), EBIKE_USER.MOBILE.as("phone"), EBIKE_REFUND.ORDER_ID.as("cycling_order_number"), EBIKE_PAYMENT.TOTAL.as("actual_pay_amount"), - EBIKE_REFUND.REMARK.as("reject_reason"), EBIKE_REFUND.PROCESS_TIME.as("reject_time"), - QueryMethods.case_(EBIKE_PAYMENT.PAYMENT_METHOD) - .when(PayMethod.wechat.name()).then("微信支付") - .when(PayMethod.alipay.name()).then("支付宝") - .when(PayMethod.balance.name()).then("余额").end().as("pay_method"), - 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") - ) - .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)) + EBIKE_REFUND.REMARK.as("reject_reason"), EBIKE_REFUND.PROCESS_TIME.as("reject_time"), + QueryMethods.case_(EBIKE_PAYMENT.PAYMENT_METHOD) + .when(PayMethod.wechat.name()).then("微信支付") + .when(PayMethod.alipay.name()).then("支付宝") + .when(PayMethod.balance.name()).then("余额").end().as("pay_method"), + 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.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)) .leftJoin(EBIKE_USER_ORDERS).on(EBIKE_USER_ORDERS.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID)) - .where(EBIKE_REFUND.PROCESS_STATE.eq(String.valueOf(closed.ordinal()))); - if(refundDto.getPhone() != null && !refundDto.getPhone().isEmpty()) + .where(EBIKE_REFUND.PROCESS_STATE.eq(String.valueOf(closed.ordinal()))); + if (refundDto.getPhone() != null && !refundDto.getPhone().isEmpty()) query.and(EBIKE_USER.MOBILE.like(refundDto.getPhone())); - if(refundDto.getCyclingOrderNumber()!= null &&!refundDto.getCyclingOrderNumber().isEmpty()) + if (refundDto.getCyclingOrderNumber() != null && !refundDto.getCyclingOrderNumber().isEmpty()) query.and(EBIKE_REFUND.ORDER_ID.like(refundDto.getCyclingOrderNumber())); - if(refundDto.getRefundTime()!=null&&!refundDto.getRefundTime().isEmpty()){ + if (refundDto.getRefundTime() != null && !refundDto.getRefundTime().isEmpty()) { query.and(EBIKE_REFUND.REFUND_TIME.ge(refundDto.getRefundTime().get(0))); - if(refundDto.getRefundTime().size()==2) + if (refundDto.getRefundTime().size() == 2) query.and(EBIKE_REFUND.REFUND_TIME.le(refundDto.getRefundTime().get(1))); } Page page = refundDto.getPageParam().getPage(); @@ -228,7 +232,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl