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

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

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

@@ -88,6 +88,14 @@
    }

    /**
     * 跳转到接送机价格设置首页
     */
    @RequestMapping("/transfer")
    public String transfer() {
        return PREFIX + "transfer.html";
    }

    /**
     * 跳转到添加专车价格设置
     */
    @RequestMapping("/tSystemPrice_add")
@@ -110,6 +118,31 @@
        }
        model.addAttribute("modelList",serverCarmodels);
        return PREFIX + "tSystemPrice_add.html";
    }

    /**
     * 跳转到添加专车价格设置
     */
    @RequestMapping("/tSystemPrice_addTransfer")
    public String tSystemPrice_addTransfer(Model model) {
        //查询所有专车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 7).eq("companyId", ShiroKit.getUser().getObjectId()).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
        for(TServerCarmodel tsc : modelList){
            boolean b = true;
            for(TSystemPrice tsp : tSystemPrices){
                if(tsc.getId().compareTo(tsp.getServerCarModelId()) == 0){
                    b = false;
                    break;
                }
            }
            if(b){
                serverCarmodels.add(tsc);
            }
        }
        model.addAttribute("modelList",serverCarmodels);
        return PREFIX + "tSystemPrice_addTransfer.html";
    }

    /**
@@ -147,6 +180,40 @@
    }

    /**
     * 跳转到修改接送机价格设置
     */
    @RequestMapping("/tSystemPrice_updateTransfer/{tSystemPriceId}")
    public String tSystemPrice_updateTransfer(@PathVariable Integer tSystemPriceId, Model model) {
        TSystemPrice tSystemPrice = tSystemPriceService.selectById(tSystemPriceId);
        model.addAttribute("item",tSystemPrice);
        LogObjectHolder.me().set(tSystemPrice);

        JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
        model.addAttribute("json",json);

        //查询所有专车车型
        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 7).eq("companyId", ShiroKit.getUser().getObjectId()).ne("state", 3));
        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 7).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
        for(TServerCarmodel tsc : modelList){
            boolean b = true;
            for(TSystemPrice tsp : tSystemPrices){
                if(tsc.getId().compareTo(tsp.getServerCarModelId()) == 0){
                    b = false;
                    break;
                }
            }
            if(b){
                serverCarmodels.add(tsc);
            }
        }
        serverCarmodels.add(tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId()));
        model.addAttribute("modelList",serverCarmodels);

        return PREFIX + "tSystemPrice_editTransfer.html";
    }

    /**
     * 获取专车价格设置列表
     */
    @RequestMapping(value = "/listSpecial")
@@ -154,6 +221,17 @@
    public Object list(String name,Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
        return super.packForBT(page);
    }

    /**
     * 获取接送机价格设置列表
     */
    @RequestMapping(value = "/listTransfer")
    @ResponseBody
    public Object listTransfer(String name,Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tSystemPriceService.getTransferPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
        return super.packForBT(page);
    }

@@ -189,6 +267,37 @@
    }

    /**
     * 新增接送机价格设置
     */
    @RequestMapping(value = "/addTransfer")
    @ResponseBody
    public Object addTransfer(TSystemPrice tSystemPrice) {
        //判断当前公司是否添加过该专车车型价格配置
        int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                .eq("type", 7)
                .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
                .eq("companyId",ShiroKit.getUser().getObjectId())
                .last(" and not FIND_IN_SET(state,'3')"));
        if (count > 0){
            TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
            return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
        }
        tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
        tSystemPrice.setType(7);
        tSystemPrice.setState(1);
        tSystemPriceService.insert(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

    /**
     * 修改专车价格设置
     */
    @RequestMapping(value = "/update")
@@ -220,6 +329,37 @@
    }

    /**
     * 修改专车价格设置
     */
    @RequestMapping(value = "/updateTransfer")
    @ResponseBody
    public Object updateTransfer(TSystemPrice tSystemPrice) {
        TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
        if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
            //判断当前公司是否添加过该专车车型价格配置
            int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
                    .eq("type", 7)
                    .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
                    .eq("companyId",ShiroKit.getUser().getObjectId())
                    .last(" and not FIND_IN_SET(state,'3')"));
            if (count > 0){
                TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
                return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
            }
        }
        tSystemPriceService.updateById(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport) {//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

    /**
     * 修改状态
     */
    @RequestMapping(value = "/opt")