Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-06-28 85d8efdb96a9b4900dbceef524a29690e13b7800

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -1304,7 +1304,7 @@
    @PostMapping("/base/aliPayOrderTaxi")
    public void aliPayOrderTaxi(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.alipayCallback(request);//icbcPayUtil.payCallback(request);
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            if(null != map){
                String out_trade_no = map.get("out_trade_no");
                String order_id = map.get("trade_no");