From 7a14e1592dd0c2cfd6cd4e8b11f95c9f46f2ffe7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 七月 2023 20:07:04 +0800
Subject: [PATCH] 修改支付相关逻辑代码

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
index 982f9c8..4e29146 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
@@ -61,7 +61,7 @@
                 if(ToolUtil.isNotEmpty(out_trade_no)){
                     Integer language = Integer.valueOf(out_trade_no.substring(17, 18));
                     Integer id = Integer.valueOf(out_trade_no.substring(18));
-                    userInfoService.payCancelUserBalance(null, order_id, Integer.valueOf(id), 1, language);
+                    userInfoService.payCancelUserBalance(null, order_id, Integer.valueOf(id), language);
                     callbackResponse.setCheckout_request_id(order_id);
                     callbackResponse.setMerchant_transaction_id(out_trade_no);
                     callbackResponse.setStatus_code("183");
@@ -90,16 +90,16 @@
     @PostMapping("/aliCancelUserBalance")
     public void aliCancelUserBalance(HttpServletRequest request, HttpServletResponse response){
         try {
-            Map<String, String> map = payMoneyUtil.alipayCallback(request);
-            String id = map.get("out_trade_no");
-            String order_id = map.get("out_trade_no");
-            String[] s = order_id.split("_");
-            Integer language = Integer.valueOf(s[1]);
-            userInfoService.payCancelUserBalance(null, s[0], Integer.valueOf(id), 2, language);
-            response.setContentType("text/html;charset=UTF-8");
-            PrintWriter out;
-            out = response.getWriter();
-            out.println("success"); // 请不要修改或删除
+//            Map<String, String> map = payMoneyUtil.alipayCallback(request);
+//            String id = map.get("out_trade_no");
+//            String order_id = map.get("out_trade_no");
+//            String[] s = order_id.split("_");
+//            Integer language = Integer.valueOf(s[1]);
+//            userInfoService.payCancelUserBalance(null, s[0], Integer.valueOf(id), 2, language);
+//            response.setContentType("text/html;charset=UTF-8");
+//            PrintWriter out;
+//            out = response.getWriter();
+//            out.println("success"); // 请不要修改或删除
         }catch (Exception e){
             e.printStackTrace();
         }

--
Gitblit v1.7.1