From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
index 4bd7ea5..171369c 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java
@@ -1,11 +1,10 @@
package com.ruoyi.payment.controller;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.v2.AppletPayUtil;
-import com.ruoyi.payment.ali.v2.model.PaymentReq;
-import com.ruoyi.payment.ali.v2.model.PaymentResp;
-import com.ruoyi.payment.ali.v2.model.QueryResp;
+import com.ruoyi.payment.api.model.*;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
@@ -13,6 +12,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
/**
* @author zhibing.pu
@@ -78,6 +79,34 @@
throw new RuntimeException("关闭支付宝订单失败");
}
}
+ /**
+ * 后台退款 远程调用
+ */
+ @PostMapping("/refund")
+ public R<RefundResp> refund(@RequestBody RefundReq dto){
+ return R.ok(appletPayUtil.refund(dto));
+ }
+
+
+ @ResponseBody
+ @PostMapping(value = "/allCallBack")
+ public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response) {
+ try {
+ String out_trade_no = aliQueryOrder.getOutTradeNo();
+ String transaction_id = aliQueryOrder.getTradeNo();
+ String attach = aliQueryOrder.getPassbackParams();
+// AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
+// if (ajaxResult.isSuccess()) {
+// PrintWriter writer = response.getWriter();
+// writer.println("success");
+// writer.flush();
+// writer.close();
+// }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
--
Gitblit v1.7.1