Merge remote-tracking branch 'origin/master'

luodangjia

2024-06-05 caad86093475a38d79886eb8e77aa288bfb74d89

 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");