8.18

liujie

2025-08-20 f9bbbfeabe3d2690679cef7583ac1c42912706db

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -743,6 +743,10 @@
        }
        this.updateAllColumnById(orderCrossCity);


        if(userInfo.getPhone()!=null){
            SMSUtil.send(userInfo.getPhone(), "您的订单已生成，如有疑问请咨询0715-8911666", "2431012323525");
        }
        return resultUtil;
    }
//    /**
@@ -1426,6 +1430,7 @@
        Timer timer = new Timer();
        timer.schedule(timerTask, 30 * 60 * 1000);


        return ResultUtil.success(baseWarpper);
    }

@@ -1966,8 +1971,11 @@
        List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
        if(orderCrossCities.size() == 0){
            Driver driver = driverService.selectById(orderCrossCity.getDriverId());
            driver.setState(2);
            driverService.updateById(driver);
            if(driver!=null){
                driver.setState(2);
                driverService.updateById(driver);
            }

        }
//        }
//        else{
@@ -2587,7 +2595,7 @@
                        }
//                        if(i == querys.size() && state == 1){
                        if(i == 3 && state == 1){
                            pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
                            pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3);
                            orderIds.remove(orderCrossCity.getId());
                                orderCrossCity.setState(10);
                                orderCrossCityMapper.updateById(orderCrossCity);