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 dd346148..72e42eef 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 @@ -197,4 +197,16 @@ public class EbikeWxPaymentController { Page list = ebikeRefundService.queryRefundTradeRecordById(reqTradeRecordDto); return JsonResult.success(list); } + + /** + * 退款申请用户退款记录 + * + * @param reqTradeRecordDto + * @return + */ + @PostMapping("/refundApplyRefundRecord") + public JsonResult refundApplyRefundRecord(@RequestBody ReqRefundRecordDto reqTradeRecordDto) { + Page list = ebikeRefundService.queryRefundRefundRecordById(reqTradeRecordDto); + return JsonResult.success(list); + } } diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/RefundRecordListDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/RefundRecordListDto.java new file mode 100644 index 00000000..a8c7b48d --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/RefundRecordListDto.java @@ -0,0 +1,93 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author:Ding + * @ClassName:RefundRecordListDto + * @Package:com.cdzy.payment.model.dto.RefundRecordListDto + * @Description:退款申请用户退款记录 + * @CreateDate:2025年05月22日 + * @Version:V1.0 + **/ +@Data +public class RefundRecordListDto { + + /** + * 申请时间 + */ + private LocalDateTime applyTime; + + /** + * 运营区域 + */ + private String operate; + + /** + * 订单编号 + */ + private String orderId; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 实付金额 + */ + private BigDecimal actualPayAmount; + + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 处理状态 + */ + private String handleState; + + /** + * 到账状态 + */ + private String arrivedState; + + /** + * 退款到账时间 + */ + private String arrivedTime; + + /** + * 退款方式 + */ + private String refundMethod; + + /** + * 申请人 + */ + private String applicant; + + /** + * 申请原因 + */ + private String applyReason; + + /** + * 支付方式 + */ + private String payMethod; + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 来源 + */ + private String source; +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundRecordDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundRecordDto.java new file mode 100644 index 00000000..3631903e --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundRecordDto.java @@ -0,0 +1,26 @@ +package com.cdzy.payment.model.dto; + +import com.cdzy.common.model.PageParam; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * @author:Ding + * @ClassName:ReqTradeRecordDto + * @Package:com.cdzy.payment.model.dto.ReqTradeRecordDto + * @Description:交易记录查询dto + * @CreateDate:2025年05月21日 + * @Version:V1.0 + **/ +@Data +public class ReqRefundRecordDto { + + private String phone; + + /** + * 分页参数 + */ + @NotNull(message = "分页参数不能为空") + private PageParam pageParam; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeRefundService.java b/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeRefundService.java index 1ee993db..f0f34b91 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeRefundService.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeRefundService.java @@ -90,8 +90,16 @@ public interface EbikeRefundService extends IService { /** * 退款申请交易记录 * - * @param reqTradeRecordDto 退款id + * @param reqTradeRecordDto * @return */ Page queryRefundTradeRecordById(ReqTradeRecordDto reqTradeRecordDto); + + /** + * 退款申请用户退款记录 + * + * @param reqRefundRecordDto + * @return + */ + Page queryRefundRefundRecordById(ReqRefundRecordDto reqRefundRecordDto); } 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 6f27d95a..dc15aae3 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 @@ -254,4 +254,17 @@ public class EbikeRefundServiceImpl extends ServiceImpl page = reqTradeRecordDto.getPageParam().getPage(); return pageAs(page, query, TransactionRecord.class); } + + @Override + public Page queryRefundRefundRecordById(ReqRefundRecordDto reqRefundRecordDto) { + +// QueryWrapper query = QueryWrapper.create() +// .select() +// .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)) +// .where(EBIKE_USER.MOBILE.eq(reqRefundRecordDto.getPageParam())); +// Page page = reqRefundRecordDto.getPageParam().getPage(); +// return pageAs(page, query, RefundRecordListDto.class); + return null; + } }