From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
index 21bb1ce..e82b985 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
@@ -174,6 +174,7 @@
             String subject = params.get("subject");
             String total_amount = params.get("total_amount");
             String trade_no = params.get("trade_no");
+            String passback_params = params.get("passback_params");
             map.put("out_trade_no", out_trade_no);//商家订单号
             map.put("subject", subject);
             map.put("total_amount", total_amount);
@@ -344,10 +345,10 @@
                     map1.put("result", result);
                     return map1;
                 }else{
-//                    System.err.println(map.get("err_code_des"));
+                    System.err.println(map.get("err_code_des"));
                 }
             }else{
-//                System.err.println(map.get("return_msg"));
+                System.err.println(map.get("return_msg"));
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -779,7 +780,7 @@
 //        PayMoneyUtil payMoneyUtil = new PayMoneyUtil();
 //        payMoneyUtil.weixinpay("测试", "123", "12.5", "");
         PayMoneyUtil payMoneyUtil = new PayMoneyUtil();
-        payMoneyUtil.weixinpay("完成订单", "4861","4861_1_fei","172","/base/wxPayOrderTaxi","JSAPI","o5o4Q5Cwvoxa7m7DciaNZmZauFuM");
+        payMoneyUtil.weixinpay("完成订单", "4861","4861_1_fei","172","/basewxPayOrderTaxi","JSAPI","o5o4Q5Cwvoxa7m7DciaNZmZauFuM");
     }
 
 

--
Gitblit v1.7.1