puzhibing
2026-02-26 95b192373e88c687e32fa9327aba4f48af0f602b
修改bug
4个文件已修改
19 ■■■■■ 已修改文件
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1052,6 +1052,9 @@
//            String app = type == 1 ? "APP" : "JSAPI";
//            resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_3_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
            if(ToolUtil.isEmpty(appletsOpenId)){
                return ResultUtil.error("获取微信身份信息失败,无法发起支付");
            }
            //创建订单并拉起支付(这里不需要创建行程单,由三方处理)
            Driver driver = driverService.selectById(orderCrossCity.getDriverId());
            if(null == orderCrossCity.getIsCreated() || 0 == orderCrossCity.getIsCreated()){
@@ -3081,7 +3084,7 @@
            return ResultUtil.error("乘客手机号不能为空");
        }
        if (warpper.getPlacementLat() == null || warpper.getPlacementLon() == null || ToolUtil.isEmpty(warpper.getPlacementAddress())) {
            return ResultUtil.error("下单地点点信息不完整");
            return ResultUtil.error("下单地点信息不完整");
        }
        if (warpper.getStartLon() == null || warpper.getStartLat() == null || ToolUtil.isEmpty(warpper.getStartAddress())) {
            return ResultUtil.error("上车点信息不完整");
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java
@@ -176,7 +176,7 @@
                /*根据微信端的code获取openId*/
//                openId=new JsapiTicketUtilX().getOpenId(code);
            }
            OrderRide orderRide=orderRideService.selectById(orderId);
            if(orderRide.getState()==6){
                return ApiJson.returnNG("该订单已取消");
@@ -187,6 +187,9 @@
            Double orderMoney = orderRide.getMoney();
            if(2 == payType){
                UserInfo userInfo = userInfoService.selectById(orderRide.getUserId());
                if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
                    return ResultUtil.error("获取微信身份信息失败,无法发起支付");
                }
                if(null == orderRide.getIsCreated() || 0 == orderRide.getIsCreated()){
                    //调用中台创建订单及拉起支付接口
                    TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData();
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2191,6 +2191,10 @@
            if (orderMoney == 0) {
                return ResultUtil.error("请使用余额支付");
            }
            if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
                return ResultUtil.error("获取微信身份信息失败,无法发起支付");
            }
//            String app = type == 1 ? "APP" : "JSAPI";
//            resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_1_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
            //如果没有创建行程,需要先创建行程单
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1561,7 +1561,10 @@
            }
//            String app = type == 1 ? "APP" : "JSAPI";
//            resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_2_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
            if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
                return ResultUtil.error("获取微信身份信息失败,无法发起支付");
            }
            Driver driver = driverService.selectById(orderTaxi.getDriverId());
            if(ToolUtil.isEmpty(orderTaxi.getTravelId())){
                Company company = companyService.selectById(driver.getCompanyId());