From f78d6645f4f03af39dff8a3663506a55fdf01c03 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 11 十月 2024 11:19:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java index d7cc5b6..04048b4 100644 --- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java +++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java @@ -42,7 +42,7 @@ @Resource private ChargingOrderClient chargingOrderClient; - + @Resource private ShoppingOrderClient shoppingOrderClient; @@ -204,6 +204,11 @@ shoppingOrderClient.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time); System.err.println("----商城订单取消退款回调通知"); break; + //充电订单 + case "GWF": + chargingOrderClient.shoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time); + System.err.println("----管理后台取消购物订单退款回调通知"); + break; } WxRefundNotifyResp resp = new WxRefundNotifyResp(); -- Gitblit v1.7.1