修改bug

Pu Zhibing

2024-09-29 adf2ede692b76cf95d0cec80f4087e52d760b219

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -107,7 +107,7 @@
        //查询所有专车车型
        Integer objectId = ShiroKit.getUser().getObjectId();
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", objectId).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state",1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
        for(TServerCarmodel tsc : modelList){
            boolean b = true;
@@ -227,7 +227,7 @@
                .last(" and not FIND_IN_SET(state,'3')"));
        if (count > 0){
            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
            return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
            return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
        }
        tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
        tSystemPrice.setType(1);
@@ -247,7 +247,7 @@
                .last(" and not FIND_IN_SET(state,'3')"));
        if (count > 0){
            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
            return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
            return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
        }
        tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
        tSystemPrice.setType(4);
@@ -263,7 +263,7 @@
    @ResponseBody
    public Object update(TSystemPrice tSystemPrice) {
        TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
        if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
        if (obj.getServerCarModelId().compareTo(tSystemPrice.getServerCarModelId()) != 0){
            //判断当前公司是否添加过该专车车型价格配置
            int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                    .eq("type", 1)
@@ -272,7 +272,7 @@
                    .last(" and not FIND_IN_SET(state,'3')"));
            if (count > 0){
                TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
                return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
                return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
            }
        }
        tSystemPriceService.updateById(tSystemPrice);
@@ -283,7 +283,7 @@
    @ResponseBody
    public Object smallupdate(TSystemPrice tSystemPrice) {
        TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
        if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
        if (obj.getServerCarModelId().compareTo(tSystemPrice.getServerCarModelId()) != 0){
            //判断当前公司是否添加过该专车车型价格配置
            int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                    .eq("isPackage", 1)
@@ -292,7 +292,7 @@
                    .last(" and not FIND_IN_SET(state,'3')"));
            if (count > 0){
                TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
                return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
                return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
            }
        }
        tSystemPriceService.updateById(tSystemPrice);