From aceaf65756c6b03bc13a12bfd9e72c538f581439 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 05 九月 2024 13:47:14 +0800 Subject: [PATCH] 9.5 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index 953b629..63e7ff5 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -105,8 +105,7 @@ private AliPaymentClient aliPaymentClient; @Resource private TShoppingOrderService shoppingOrderService; - @Resource - + @Resource private AppUserClient appUserClient; @@ -141,6 +140,12 @@ @ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"}) public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) { return chargingOrderService.payOrderQuery(payOrderQueryDto); + } + @ResponseBody + @PostMapping(value = "/pay/order/refund") + @ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"}) + public R refund(@RequestBody PayOrderRefundDto payOrderQueryDto) { + return chargingOrderService.payRefund(payOrderQueryDto); } @ResponseBody @@ -452,24 +457,7 @@ } - /** - * 远程启动失败后退款回调 - * @param request - */ - @ResponseBody - @PostMapping(value = "/chargingOrderALICallback") - public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){ - WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData(); - if(null != data){ - String out_refund_no = data.getOut_refund_no(); - String refund_id = data.getRefund_id(); - String tradeState = data.getTradeState(); - String success_time = data.getSuccess_time(); - chargingOrderService.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time); - } - } - - + -- Gitblit v1.7.1