From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java
index 84d79ba..be9c41e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java
@@ -2,12 +2,14 @@
import com.dsh.account.service.RechargeRecordsService;
+import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@@ -33,25 +35,28 @@
@Autowired
private RechargeRecordsService recordsService;
+ @Autowired
+ private TAppUserService tappService;
+
/**
* 课包续课支付宝支付回调接口
*/
@PostMapping("/base/coursePackage/alipayPaymentCallback")
- public void alipayCallback(HttpServletRequest request, HttpServletResponse response){
+ public void alipayCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
- if(null != map){
+ if (null != map) {
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
ResultUtil resultUtil = tstuService.insertVipPaymentCallback(out_trade_no, transaction_id);
- if(resultUtil.getCode() == 200){
+ if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write("success");
out.flush();
out.close();
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -61,22 +66,22 @@
* 课包续课微信支付回调接口
*/
@PostMapping("/base/coursePackage/wechatPaymentCallback")
- public void weChatCallback(HttpServletRequest request, HttpServletResponse response){
+ public void weChatCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
- if(null != map){
+ if (null != map) {
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
String result = map.get("result");
ResultUtil resultUtil = tstuService.insertVipPaymentCallback(out_trade_no, transaction_id);
- if(resultUtil.getCode() == 200){
+ if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write(result);
out.flush();
out.close();
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -85,21 +90,21 @@
* 充值玩湃币支付宝支付回调接口
*/
@PostMapping("/base/recharge/alipayRechargeCallback")
- public void alipayRechargeCallback(HttpServletRequest request, HttpServletResponse response){
+ public void alipayRechargeCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
- if(null != map){
+ if (null != map) {
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
ResultUtil resultUtil = recordsService.addRechargeCallbackPay(out_trade_no, transaction_id);
- if(resultUtil.getCode() == 200){
+ if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write("success");
out.flush();
out.close();
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -109,22 +114,79 @@
* 课包续课微信支付回调接口
*/
@PostMapping("/base/recharge/wechatRechargeCallback")
- public void wechatRechargeCallback(HttpServletRequest request, HttpServletResponse response){
+ public void wechatRechargeCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
- if(null != map){
+ if (null != map) {
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
String result = map.get("result");
ResultUtil resultUtil = recordsService.addRechargeCallbackPay(out_trade_no, transaction_id);
- if(resultUtil.getCode() == 200){
+ if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write(result);
out.flush();
out.close();
}
}
- }catch (Exception e){
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 兑换商品支付的微信回调
+ *
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/pointMer/exchangeGoodPaymentWeChatCallback")
+ public void exchangeGoodPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ if (null != map) {
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+ String result = map.get("result");
+ ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, transaction_id, 1);
+ if (resultUtil.getCode() == 200) {
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 兑换商品支付的支付宝回调
+ *
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/pointMer/exchangeGoodPaymentAliCallback")
+ public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ if (null != map) {
+ String out_trade_no = map.get("out_trade_no");
+ String trade_no = map.get("trade_no");
+ ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, trade_no, 2);
+ if (resultUtil.getCode() == 200) {
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
+ }
+ }
+ } catch (Exception e) {
e.printStackTrace();
}
}
--
Gitblit v1.7.1