From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 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 b853f8e..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
@@ -42,21 +42,21 @@
      * 课包续课支付宝支付回调接口
      */
     @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();
         }
     }
@@ -66,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();
         }
     }
@@ -90,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();
         }
     }
@@ -114,22 +114,22 @@
      * 课包续课微信支付回调接口
      */
     @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();
         }
     }
@@ -137,27 +137,28 @@
 
     /**
      * 兑换商品支付的微信回调
+     *
      * @param request
      * @param response
      */
     @ResponseBody
     @PostMapping("/base/pointMer/exchangeGoodPaymentWeChatCallback")
-    public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
+    public void exchangeGoodPaymentWeChatCallback(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 = tappService.exchangeAddPaymentCallback(out_trade_no, transaction_id,1);
-                if(resultUtil.getCode() == 200){
+                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){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -165,26 +166,27 @@
 
     /**
      * 兑换商品支付的支付宝回调
+     *
      * @param request
      * @param response
      */
     @ResponseBody
     @PostMapping("/base/pointMer/exchangeGoodPaymentAliCallback")
-    public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response){
+    public void addVipPaymentAliCallback(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 trade_no = map.get("trade_no");
-                ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, trade_no,2);
-                if(resultUtil.getCode() == 200){
+                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){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

--
Gitblit v1.7.1