From 68dc85d1bf05f43a9120efbc5ab038cc19c8dab6 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Fri, 14 Feb 2025 19:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/wx/WeChatPayController.java | 47 ++++++++++++++++++- .../service/wx/impl/WeChatServiceImpl.java | 13 ++--- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cultural/heritage/controller/wx/WeChatPayController.java b/src/main/java/com/cultural/heritage/controller/wx/WeChatPayController.java index 1147ebb..419ba7c 100644 --- a/src/main/java/com/cultural/heritage/controller/wx/WeChatPayController.java +++ b/src/main/java/com/cultural/heritage/controller/wx/WeChatPayController.java @@ -21,6 +21,7 @@ import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPayment import com.wechat.pay.java.service.payments.model.Transaction; import com.wechat.pay.java.service.refund.model.Refund; import com.wechat.pay.java.service.refund.model.RefundNotification; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; @@ -58,6 +59,7 @@ public class WeChatPayController { * JSAPI 下单 */ @PostMapping("/payment/create") + @Operation(summary = "JSAPI 下单", description = "参数：订单id, 权限：所有人, 方法名：createPayment") public BaseResponse createPayment(@RequestBody CommonRequest commonRequest, HttpServletRequest request) { User loginUser = userService.getLoginUser(request); String miniOpenId = loginUser.getMiniOpenId(); @@ -74,11 +76,13 @@ public class WeChatPayController { } + /** * JSAPI 下单回调 */ @PostMapping("/payment/callback") @Transactional(rollbackFor = Exception.class) + @Operation(summary = "JSAPI 下单回调", description = "参数：订单id, 权限：所有人, 方法名：callbackPayment") public synchronized BaseResponse callbackPayment(HttpServletRequest request) throws IOException { // 获取下单信息 Transaction transaction = weChatService.getTransactionInfo(request); @@ -96,6 +100,7 @@ public class WeChatPayController { * @param commonRequest 订单id */ @PostMapping("/refund/create") + @Operation(summary = "Web端管理员全额退款", description = "参数：订单id, 权限：web端管理员, 方法名：createRefund") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse createRefund(@RequestBody CommonRequest commonRequest) { if (commonRequest == null || commonRequest.getId() <= 0) { @@ -113,13 +118,12 @@ public class WeChatPayController { - - /** * Web管理员部分退款 * @param commonRequest 订单明细id */ @PostMapping("/refund/part/create") + @Operation(summary = "Web管理员部分退款", description = "参数：订单id, 权限：web端管理员, 方法名：createPartRefund") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse createPartRefund(@RequestBody CommonRequest commonRequest) { if (commonRequest == null || commonRequest.getId() <= 0) { @@ -135,11 +139,14 @@ public class WeChatPayController { + + /** * Web管理员剩余部分退款 * @param commonRequest 订单id */ @PostMapping("/refund/rest/create") + @Operation(summary = "Web管理员剩余部分退款", description = "参数：订单id, 权限：web端管理员, 方法名：createRestRefund") @AuthCheck(mustRole = UserConstant.ADMIN_ROLE) public BaseResponse createRestRefund(@RequestBody CommonRequest commonRequest) { if (commonRequest == null || commonRequest.getId() <= 0) { @@ -161,6 +168,7 @@ public class WeChatPayController { * 全额退款回调 */ @PostMapping("/refund/callback") + @Operation(summary = "全额退款回调", description = "参数：订单id, 权限：web端管理员, 方法名：callbackRefund") public BaseResponse callbackRefund(HttpServletRequest request) { // 获取退款信息 RefundNotification refundNotification = weChatService.getRefundInfo(request); @@ -171,10 +179,12 @@ public class WeChatPayController { } + /** * 部分退款回调 */ @PostMapping("/refund/part/callback") + @Operation(summary = "部分退款回调", description = "参数：订单id, 权限：web端管理员, 方法名：callbackRefundPart") public BaseResponse callbackRefundPart(HttpServletRequest request) { // 获取退款信息 RefundNotification refundNotification = weChatService.getRefundInfo(request); @@ -185,6 +195,39 @@ public class WeChatPayController { } + + + /** + * 剩余退款回调 + */ + @PostMapping("/refund/rest/callback") + @Operation(summary = "剩余退款回调", description = "参数：订单id, 权限：web端管理员, 方法名：callbackRestRefund") + public BaseResponse callbackRestRefund(HttpServletRequest request) { + // 获取退款信息 + RefundNotification refundNotification = weChatService.getRefundInfo(request); + // 退款回调 + boolean result = weChatService.refundRestCallback(refundNotification); + ThrowUtils.throwIf(!result, ErrorCode.SYSTEM_ERROR, "退款回调失败"); + return ResultUtils.success(true); + } + + + + + + + + + + + + + + + + + + // /** // * 发送订阅消息 // */ diff --git a/src/main/java/com/cultural/heritage/service/wx/impl/WeChatServiceImpl.java b/src/main/java/com/cultural/heritage/service/wx/impl/WeChatServiceImpl.java index 26ebadb..6212641 100644 --- a/src/main/java/com/cultural/heritage/service/wx/impl/WeChatServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/wx/impl/WeChatServiceImpl.java @@ -258,6 +258,10 @@ public class WeChatServiceImpl implements WeChatService { amountReq.setTotal(order.getTotalAmount().movePointRight(2).longValue()); amountReq.setCurrency("CNY"); createRequest.setAmount(amountReq); + + // 生成退款记录 + createRefundRecord(orderNumber, outRefundNo, refundAmount); + // 申请退款 System.out.println("退款请求：" + createRequest); Refund refund = wxPayConfig.getRefundService().create(createRequest); @@ -281,9 +285,6 @@ public class WeChatServiceImpl implements WeChatService { String orderNumber = refundNotification.getOutTradeNo(); Order order = getOrderInfoByOrderNumber(orderNumber); - // 生成退款记录 - createRefundRecord(refundNotification); - // 解析出订单明细id String outRefundNo = refundNotification.getOutRefundNo(); String orderItemId = RefundUtils.parseRefundNoToItemId(outRefundNo); @@ -329,7 +330,7 @@ public class WeChatServiceImpl implements WeChatService { String outRefundNo = RefundUtils.generateRefundNo(); createRequest.setOutRefundNo(outRefundNo); // 退款结果回调 - createRequest.setNotifyUrl(wxPayConfig.getNotifyUrl() + "/api/wechat/refund/callback"); + createRequest.setNotifyUrl(wxPayConfig.getNotifyUrl() + "/api/wechat/refund/rest/callback"); // 退款金额 AmountReq amountReq = new AmountReq(); long refundAmount = totalAmount.movePointRight(2).intValue(); @@ -539,11 +540,11 @@ public class WeChatServiceImpl implements WeChatService { /** * 生成退款记录 */ - private void createRefundRecord(String outTradeNo, String outRefundNo, long refundAmount) { + private void createRefundRecord(String outTradeNo, String outRefundNo, BigDecimal refundAmount) { RefundRecord refundRecord = new RefundRecord(); refundRecord.setOutTradeNo(outTradeNo); refundRecord.setOutRefundNo(outRefundNo); - refundRecord.setRefundAmount(BigDecimal.valueOf(refundAmount).movePointLeft(2)); + refundRecord.setRefundAmount(refundAmount.movePointLeft(2)); boolean save = refundRecordService.save(refundRecord); ThrowUtils.throwIf(!save, ErrorCode.OPERATION_ERROR, "退款记录生成失败");