From 6213965135aa7662044496c8affe9c62215dd991 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 22 May 2025 13:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orders/model/dto/res}/OrderRecord.java | 4 +-- .../controller/EbikeWxPaymentController.java | 8 ++--- .../payment/model/dto/ReqTradeRecordDto.java | 2 +- .../service/impl/EbikeRefundServiceImpl.java | 31 ++++++++++++++++--- 4 files changed, 33 insertions(+), 12 deletions(-) rename {ebike-payment/src/main/java/com/cdzy/payment/model/dto => ebike-orders/src/main/java/com/cdzy/orders/model/dto/res}/OrderRecord.java (96%) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderRecord.java b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/OrderRecord.java similarity index 96% rename from ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderRecord.java rename to ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/OrderRecord.java index c1a553a1..835dbb0d 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderRecord.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/OrderRecord.java @@ -1,4 +1,4 @@ -package com.cdzy.payment.model.dto; +package com.cdzy.orders.model.dto.res; import lombok.Data; @@ -33,7 +33,7 @@ public class OrderRecord { /** * 创建时间 */ - private LocalDateTime createTime; + private LocalDateTime createAt; /** * 骑行时长 diff --git a/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java b/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java index 72e42eef..a7df3237 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java @@ -16,8 +16,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 用户订单微信支付 控制层。 * @@ -201,12 +199,12 @@ public class EbikeWxPaymentController { /** * 退款申请用户退款记录 * - * @param reqTradeRecordDto + * @param reqRefundRecordDto * @return */ @PostMapping("/refundApplyRefundRecord") - public JsonResult refundApplyRefundRecord(@RequestBody ReqRefundRecordDto reqTradeRecordDto) { - Page list = ebikeRefundService.queryRefundRefundRecordById(reqTradeRecordDto); + public JsonResult refundApplyRefundRecord(@RequestBody ReqRefundRecordDto reqRefundRecordDto) { + Page list = ebikeRefundService.queryRefundRefundRecordById(reqRefundRecordDto); return JsonResult.success(list); } } diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqTradeRecordDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqTradeRecordDto.java index e4d225bf..9e1393e2 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqTradeRecordDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqTradeRecordDto.java @@ -15,7 +15,7 @@ import lombok.Data; @Data public class ReqTradeRecordDto { - private String refundId; + private String phone; /** * 分页参数 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 e8766d46..8b595c22 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 @@ -4,6 +4,7 @@ import com.cdzy.payment.model.dto.*; import com.cdzy.payment.model.enums.PayMethod; import com.ebike.feign.clients.OrdersFeignClient; import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryColumn; import com.mybatisflex.core.query.QueryMethods; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -251,12 +252,34 @@ public class EbikeRefundServiceImpl extends ServiceImpl queryRefundTradeRecordById(ReqTradeRecordDto reqTradeRecordDto) { QueryWrapper query = QueryWrapper.create() - .select(EBIKE_PAYMENT.TOTAL.as("amount"), EBIKE_PAYMENT.CREATE_TIME) - .leftJoin(EBIKE_PAYMENT).on(EBIKE_PAYMENT.ORDER_ID.eq(EBIKE_REFUND.ORDER_ID)) - .where(EBIKE_REFUND.REFUND_ID.eq(reqTradeRecordDto.getRefundId())); + .from(EBIKE_REFUND) + .select(EBIKE_REFUND.REFUND.as("amount"), EBIKE_REFUND.CREATE_TIME) + .select("'退款' as transaction_content") + .select("'收入' as transaction_type") + .leftJoin(EBIKE_USER_ORDERS).on(EBIKE_REFUND.ORDER_ID.eq(EBIKE_USER_ORDERS.ORDER_ID)) + .leftJoin(EBIKE_USER).on(EBIKE_USER_ORDERS.USER_ID.eq(EBIKE_USER.USER_ID)) + .where(EBIKE_USER.MOBILE.eq(reqTradeRecordDto.getPhone())); + + QueryWrapper payQuery = QueryWrapper.create() + .from(EBIKE_REFUND) + .select(EBIKE_PAYMENT.TOTAL.as("amount"), EBIKE_PAYMENT.CREATE_TIME, + QueryMethods.case_(EBIKE_USER_ORDERS.ORDER_TYPE) + .when("1").then("骑行扣费") + .when("2").then("骑行卡购买") + .when("3").then("会员卡续费") + .end().as("transaction_content")) + .select("'支出' as transaction_type") + .leftJoin(EBIKE_PAYMENT).on(EBIKE_REFUND.ORDER_ID.eq(EBIKE_PAYMENT.ORDER_ID)) + .leftJoin(EBIKE_USER).on(EBIKE_PAYMENT.USER_ID.eq(EBIKE_USER.USER_ID)) + .leftJoin(EBIKE_USER_ORDERS).on(EBIKE_PAYMENT.ORDER_ID.eq(EBIKE_USER_ORDERS.ORDER_ID)) + .where(EBIKE_USER.MOBILE.eq(reqTradeRecordDto.getPhone())); + + QueryWrapper all = QueryWrapper.create() + .select("amount", "transaction_content", "transaction_type", "create_time") + .from(query.unionAll(payQuery)).as("a"); Page page = reqTradeRecordDto.getPageParam().getPage(); - return pageAs(page, query, TransactionRecord.class); + return pageAs(page, all, TransactionRecord.class); } @Override