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

liujie

2026-04-12 dd45d210e2cbc60321fd3ed0c2ef5a0ba533faf5

 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java

@@ -236,10 +236,10 @@
                    orderLogisticsService.payOrderLogisticsCallback(orderId,",",4);
                }
                if(integer==6){
                    orderPrivateCarService.payOrderPrivateCarCallback(orderId,",",4);
                    orderPrivateCarService.payOrderPrivateCarCallback(orderId,",",4, null);
                }
                if(integer==9){
                    orderTaxiService.payOrderTaxiCallback(orderId,"",4,paymentId);
                    orderTaxiService.payOrderTaxiCallback(orderId,"",4,paymentId, null);
                }
                if(integer==1){
                    orderPrivateCarService.payCancelOrderPrivateCar(orderId,",",4);