Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java

@@ -265,7 +265,7 @@
    public void wxPayCrossCity(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
//            System.err.println(JSON.toJSONString(map));
            System.err.println(JSON.toJSONString(map));
            if(null != map){
                String out_trade_no = map.get("out_trade_no");
                String transaction_id = map.get("transaction_id");