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 5d0acfc..ccb129a 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 @@ -78,8 +78,8 @@ public class EbikeWxPaymentController { */ @PostMapping("/refundApply") public JsonResult refundApply(@RequestBody EbikeOrderRefundDto ebikeRefundDto) { - Long r = wxPayService.refundApply(ebikeRefundDto.getOrderId(), ebikeRefundDto.getReason()); - return JsonResult.success(r); + Long refundId = wxPayService.refundApply(ebikeRefundDto.getOrderId(), ebikeRefundDto.getReason()); + return JsonResult.success(refundId); } /** @@ -149,7 +149,7 @@ public class EbikeWxPaymentController { } /** - * 退款订单详情 + * 退款订单详情 bu * * @param refundId 退款id * @return 退款详情 @@ -172,20 +172,20 @@ public class EbikeWxPaymentController { return JsonResult.success(refundApplyOrderInfoVo); } - /** - * 退款申请用户详情 - * - * @param refundId 退款id - * @return 退款申请用户详情 - */ - @GetMapping("/refundApplyUserDetail/{refundId}") - public JsonResult refundApplyUserDetail(@PathVariable(name = "refundId") Long refundId) { - EbikeRefundUserDetailInfoVo refundUserDetailInfoVo = wxPayService.queryRefundUserInfoById(refundId); - return JsonResult.success(refundUserDetailInfoVo); - } +// /** +// * 退款申请用户详情 +// * +// * @param refundId 退款id +// * @return 退款申请用户详情 +// */ +// @GetMapping("/refundApplyUserDetail/{refundId}") +// public JsonResult refundApplyUserDetail(@PathVariable(name = "refundId") Long refundId) { +// EbikeRefundUserDetailInfoVo refundUserDetailInfoVo = wxPayService.queryRefundUserInfoById(refundId); +// return JsonResult.success(refundUserDetailInfoVo); +// } /** - * 退款申请用户交易记录 + * 退款申请用户交易记录 -bu * * @param userQueryDto 查询条件 */ diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeRefund.java b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeRefund.java index c29269b..1808f13 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeRefund.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeRefund.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("ebike_Refund") +@Table("ebike_refund") public class EbikeRefund implements Serializable { @@ -38,7 +38,7 @@ public class EbikeRefund implements Serializable { /** * 退款单号 */ - private String refundOrder; + private String refundOrderId; /** * 订单号 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 8339553..0b357f6 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 @@ -82,7 +82,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl page = refundDto.getPageParam().getPage(); @@ -268,7 +268,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl {}", ebikeRefund.getRefundId()); // 调用微信退款查询接口,查询退款状态 - Refund refund = wxPayService.queryRefundByOutTradeNo(ebikeRefund.getRefundOrder()); + Refund refund = wxPayService.queryRefundByOutTradeNo(ebikeRefund.getRefundOrderId()); if (refund != null) { // 3. 更新退款单状态 ebikeRefundService.updateRefundStatus(refund); diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeUserRealInfoService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeUserRealInfoService.java index 19e215a..eb6e9d0 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeUserRealInfoService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeUserRealInfoService.java @@ -1,9 +1,6 @@ package com.cdzy.user.service; -import com.cdzy.user.model.dto.EbikeUserRealInfoDto; import com.cdzy.user.model.entity.EbikeUserRealInfo; -import com.cdzy.user.model.vo.EbikeUserVo; -import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; /**