igo出行
parent: c70376e2 | 补丁 | 提交 | ignore whitespace
zhibing.pu
2024-08-12 099a8569927167ebbbc570531c85d231bfca6d2b 
修改2.0 bug
2个文件已修改
2个文件已添加
54 ■■■■■ 已修改文件
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverWorkService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverWorkServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java


@@ -209,7 +209,7 @@


    private ICarService carService;


    


    @Resource


    private DriverWorkMapper driverWorkMapper;


    private IDriverWorkService driverWorkService;


    


    


    @Value("${filePath}")


@@ -564,8 +564,8 @@


                                }


    


                                Driver driver1 = driverService.selectById(driver.getId());


                                DriverWork driverWork = driverWorkMapper.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())


                                        .eq("state", 1).like("type", "4").getEntity());


                                DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())


                                        .eq("state", 1).like("type", "4"));


                                if(null == driverWork || driver1.getState() != 2){


                                    continue;


                                }


@@ -890,8 +890,8 @@


                    }


    


                    Driver driver1 = driverService.selectById(dr.getId());


                    DriverWork driverWork = driverWorkMapper.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())


                            .eq("state", 1).like("type", "4").getEntity());


                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())


                            .eq("state", 1).like("type", "4"));


                    if(driver1.getState() == 2 || null != driverWork){


                        orderLogistics.setDriverId(dr.getId());


                        orderLogistics.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (


@@ -2981,7 +2981,7 @@


        if(null == orderLogistics){


            return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");


        }


        if(orderLogistics.getState() > 5 && orderLogistics.getState() != 12){


        if(orderLogistics.getState() > 5 && orderLogistics.getState() != 11 && orderLogistics.getState() != 12){


            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");


        }


    


@@ -3049,7 +3049,7 @@


            driverService.updateById(driver);


        }


        


        if(orderLogistics.getState() == 10 || orderLogistics.getState() == 12){


        if((orderLogistics.getState() == 10 || orderLogistics.getState() == 12) && null != orderLogistics.getDriverId()){


            //修改行程信息


            fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);


        }




 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java


@@ -209,7 +209,7 @@


    private ICarService carService;


    


    @Resource


    private DriverWorkMapper driverWorkMapper;


    private IDriverWorkService driverWorkService;








@@ -501,8 +501,8 @@


                    }


    


                    Driver driver = driverService.selectById(dr.getId());


                    DriverWork driverWork = driverWorkMapper.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())


                            .eq("state", 1).like("type", "1").getEntity());


                    DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", dr.getId())


                            .eq("state", 1).like("type", "1"));


                    if(driver.getState() == 2 && null != driverWork){


                        orderPrivateCar.setDriverId(dr.getId());


                        orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (


@@ -740,7 +740,7 @@


        if(null == orderPrivateCar){


            return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");


        }


        if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 12){


        if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11 && orderPrivateCar.getState() != 12){


            return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");


        }


        


@@ -839,7 +839,7 @@


        }


        


        //修改行程信息


        if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){


        if((orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12) && null != orderPrivateCar.getDriverId()){


            fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);


        }


        


@@ -1040,8 +1040,8 @@


                                }


    


                                Driver driver1 = driverService.selectById(driver.getId());


                                DriverWork driverWork = driverWorkMapper.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())


                                        .eq("state", 1).like("type", "1").getEntity());


                                DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())


                                        .eq("state", 1).like("type", "1"));


                                if(driver1.getState() != 2 || null == driverWork){


                                    continue;


                                }




 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverWorkService.java


New file


@@ -0,0 +1,11 @@


package com.stylefeng.guns.modular.system.service;




import com.baomidou.mybatisplus.service.IService;


import com.stylefeng.guns.modular.system.model.DriverWork;




/**


 * @author zhibing.pu


 * @Date 2024/8/10 17:32


 */


public interface IDriverWorkService extends IService<DriverWork> {


}




 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverWorkServiceImpl.java


New file


@@ -0,0 +1,15 @@


package com.stylefeng.guns.modular.system.service.impl;




import com.baomidou.mybatisplus.service.impl.ServiceImpl;


import com.stylefeng.guns.modular.system.dao.DriverWorkMapper;


import com.stylefeng.guns.modular.system.model.DriverWork;


import com.stylefeng.guns.modular.system.service.IDriverWorkService;


import org.springframework.stereotype.Service;




/**


 * @author zhibing.pu


 * @Date 2024/8/10 17:33


 */


@Service


public class DriverWorkServiceImpl extends ServiceImpl<DriverWorkMapper, DriverWork> implements IDriverWorkService {


}