合并代码

Pu Zhibing

5 天以前 8399270e3f12301ddf143c87bec9ca1be7b54ff0

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java

@@ -1,33 +1,22 @@
package com.stylefeng.guns.modular.system.controller.general;

import com.alibaba.fastjson.JSONObject;
import com.alipay.api.domain.CarModel;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DepositExample;
import com.stylefeng.guns.core.util.PaymentTypeEnum;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.cloudPayment.req.DepositReq;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.unionpay.upyzt.exception.UpyztException;
import com.unionpay.upyzt.resp.DepositResp;
import com.unionpay.upyzt.util.StringUtils;
import io.netty.util.internal.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.websocket.SendHandler;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
@@ -90,51 +79,14 @@

    @Autowired
    private ITElectricRecordService recordService;
    @RequestMapping ("/record")
    @ResponseBody
    public ResultUtil record(BigDecimal money,String orderNum ){
        System.out.println("============"+money+"========="+orderNum);
        DepositReq depositReq = new DepositReq();
        depositReq.setOutOrderNo(ToolUtil.getRandomString(32));
        //-
        depositReq.setAmount(money.multiply(new BigDecimal(100)).intValue()); // 支付金额
        depositReq.setBalanceAcctId("2008429872055963229");
        depositReq.setDepositType("1");
        depositReq.setPaymentType(PaymentTypeEnum.CUP_APP.getCode());
        //-
        depositReq.setPaymentTradeNo(orderNum);
        depositReq.setPaymentSucceededAt(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date()));
        //-
        depositReq.setOrderNo(orderNum);
        depositReq.setOrderAmount(money.multiply(new BigDecimal(100)).longValue());
        depositReq.setProductName("充值金额");
        depositReq.setProductCount(1);
        depositReq.setNotifyUrl("http://zhentonggongsi.com:8010/api/placeOrder/notifyUrlOne");
        DepositResp depositResp = null;
        try {
            depositResp = DepositExample.create(depositReq);
            TElectricRecord tElectricRecord = new TElectricRecord();
            tElectricRecord.setMoney(money);
            tElectricRecord.setInsertTime(new Date());
            tElectricRecord.setOrderNum(orderNum);
            tElectricRecord.setComOrder(depositResp.getOutOrderNo());
            recordService.insert(tElectricRecord);
        } catch (UpyztException e) {
//            log.error(e.getMessage());
            e.printStackTrace();
        }





        System.err.println(depositResp);
//        log.info("支付充值成功:{}",depositResp);


        return ResultUtil.success();
    }

   @Autowired
   ITSystemPriceService priceService;
   @Autowired
   private ITServerCarmodelService serverCarmodelService;
   @Resource
   private ShiroExtUtil shiroExtUtil;
	
    @RequestMapping ("/check-change/{id}")
    @ResponseBody
    public ResultUtil Change(@PathVariable Integer id,String priceType,String isCheck ) {
@@ -160,27 +112,25 @@
                }
            }
        }
        String join = String.join(",", split);
        carModel.setIsCheck(join);
        serverCarmodelService.updateById(carModel);
        System.err.println("================="+id+"===="+priceType);
            return new ResultUtil(null,0,"保存成功");
       String join = String.join(",", split);
       carModel.setIsCheck(join);
       serverCarmodelService.updateById(carModel);
       System.err.println("=================" + id + "====" + priceType);
       return new ResultUtil(null, 0, "保存成功");
    }
    @Autowired
    private ITServerCarmodelService serverCarmodelService;
    @Autowired ITSystemPriceService priceService;
    @RequestMapping("/checklist")
    @ResponseBody
    public Object checklist(Model model) {
        Integer id = ShiroKit.getUser().getId();
	
   @RequestMapping("/checklist")
   @ResponseBody
   public Object checklist(Model model) {
      Integer id = shiroExtUtil.getUser().getId();
//        List<TSystemPrice> tSystemPrices = priceService.selectList(new EntityWrapper<TSystemPrice>().eq("companyId", id).eq("type", 1).eq("state", 1));
//        List<Integer> ids = new ArrayList<>();
//        for (TSystemPrice tSystemPrice : tSystemPrices) {
//            ids.add(tSystemPrice.getServerCarModelId());
//        }


        List<TServerCarmodel> tCarModels = serverCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("state",1).eq("type",1));
		
		
      List<TServerCarmodel> tCarModels = serverCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("state",1).eq("type",1));
        TServerCarmodel type = serverCarmodelService.selectOne(new EntityWrapper<TServerCarmodel>().eq("type", 4));
        List<TServerCarmodel> returnList = new ArrayList<>();
        for (TServerCarmodel tCarModel : tCarModels) {
@@ -201,12 +151,14 @@
                returnList.add(carModel);
            }
        }
        TServerCarmodel carModel = new TServerCarmodel();
        carModel.setId(type.getId());
        carModel.setName(type.getName());
        carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
        carModel.setPriceType(null);
        returnList.add(carModel);
        if(null != type){
            TServerCarmodel carModel = new TServerCarmodel();
            carModel.setId(type.getId());
            carModel.setName(type.getName());
            carModel.setIsCheck(type.getIsCheck().equals("1") ? "是":"否");
            carModel.setPriceType(null);
            returnList.add(carModel);
        }
        return returnList;
    }

@@ -216,73 +168,73 @@
    @RequestMapping("")
    public String index(Model model) {
        //改派设置
        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
       TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
        model.addAttribute("reformist",reformist);
        //积分设置
        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
       TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
        model.addAttribute("integral",integral);
        //人脸识别
        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
       TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
        model.addAttribute("faceDistinguish",faceDistinguish);

        //快车推单(第一轮)
        TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
       TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
        model.addAttribute("zcOne",zcOne);
        //快车推单(第二轮)
        TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
       TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
        model.addAttribute("zcTwo",zcTwo);
        //快车推单(第三轮)
        TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
       TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
        model.addAttribute("zcThree",zcThree);

        //出租车推单(第一轮)
        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
       TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
        model.addAttribute("czcOne",czcOne);
        //出租车推单(第二轮)
        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
       TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
        model.addAttribute("czcTwo",czcTwo);
        //出租车推单(第三轮)
        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
       TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
        model.addAttribute("czcThree",czcThree);

        //普通取消设置(快车)
        TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
       TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
        model.addAttribute("ptCancel1",ptCancel1);
        //普通取消设置(出租车)
        TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
       TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
        model.addAttribute("ptCancel2",ptCancel2);
        //普通取消设置(跨城出行)
        TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
       TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
        model.addAttribute("ptCancel3",ptCancel3);

        //预约取消设置(快车)
        TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
       TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
        model.addAttribute("yyCancel1",yyCancel1);
        //预约取消设置(出租车)
        TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
       TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
        model.addAttribute("yyCancel2",yyCancel2);

        //拼车设置
        SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroKit.getUser().getObjectId()));
        model.addAttribute("spellOrderRule", JSONObject.parseObject(spellOrderRule.getContent()));
       SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
        model.addAttribute("spellOrderRule", null == spellOrderRule ? "" : JSONObject.parseObject(spellOrderRule.getContent()));

        //报警电话
        TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
       TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
        model.addAttribute("phone1",phone1);
        //客服电话
        TPhone phone2 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
       TPhone phone2 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
        model.addAttribute("phone2",phone2);
        //客服电话
        TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
       TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
        model.addAttribute("phone3",phone3);
        //95128电召电话
        TPhone phone4 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 4));
       TPhone phone4 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 4));
        model.addAttribute("phone4",phone4);
        //招聘电话
        TPhone phone5 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 5));
       TPhone phone5 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 5));
        model.addAttribute("phone5",phone5);
        //节假日服务费
        BigDecimal holidayFee = companyService.selectById(ShiroKit.getUser().getObjectId()).getHolidayFee();
       BigDecimal holidayFee = companyService.selectById(shiroExtUtil.getUser().getObjectId()).getHolidayFee();
        model.addAttribute("holidayFee",holidayFee);
        //超时扣款
        TSysTimeoutMoney tSysTimeoutMoney = timeoutMoneyService.selectOne(null);
@@ -326,7 +278,7 @@
            }
        }
        model.addAttribute("showModulars", map);
        TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", ShiroKit.getUser().getObjectId()));
       TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", shiroExtUtil.getUser().getObjectId()));
        if(tDriverPayDays!=null){
            model.addAttribute("driverDay", tDriverPayDays.getDay());
        }else {
@@ -350,7 +302,7 @@
     */
    @RequestMapping(value = "/setUp")
    @ResponseBody
    public Object setUp(String type, BigDecimal one, Integer two, Integer three, Integer openValue,
    public Object setUp(Integer openCityId, String type, BigDecimal one, Integer two, Integer three, Integer openValue,
                        Integer isSpecialCar,Integer isTaxiCar,
                        Double zc1,Integer zc2,Double zc3,
                        Double zc4,Integer zc5,Double zc6,
@@ -368,381 +320,400 @@
                        Integer dck1, Integer dck2,Integer driverDays) {
        //改派设置
        if("reassigningSet".equals(type)){
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
           TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(reformist)){
               reformist.setOpenCityId(openCityId);
                reformist.setMoney(one);
                reformist.setIsSpecialCar(isSpecialCar);
                reformist.setIsTaxiCar(isTaxiCar);
                tSysReformistService.updateById(reformist);
            }else{
                reformist = new TSysReformist();
                reformist.setCompanyId(ShiroKit.getUser().getObjectId());
                reformist.setMoney(one);
                reformist.setIsSpecialCar(isSpecialCar);
                reformist.setIsTaxiCar(isTaxiCar);
                tSysReformistService.insert(reformist);
            }else {
               reformist = new TSysReformist();
            reformist.setOpenCityId(openCityId);
               reformist.setMoney(one);
               reformist.setIsSpecialCar(isSpecialCar);
               reformist.setIsTaxiCar(isTaxiCar);
               tSysReformistService.insert(reformist);
            }
        }
        if("driverPayDays".equals(type)){
            TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", ShiroKit.getUser().getObjectId()));
           TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", shiroExtUtil.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(tDriverPayDays)){
                tDriverPayDays.setDay(driverDays);
                tDriverPayDays.setUpdateTime(new Date());
                driverPayDaysService.updateById(tDriverPayDays);
            }else{
                tDriverPayDays = new TDriverPayDays();
                tDriverPayDays.setCompanyId(ShiroKit.getUser().getObjectId());
                tDriverPayDays.setUpdateTime(new Date());
                tDriverPayDays.setDay(driverDays);
                driverPayDaysService.insert(tDriverPayDays);
            }else {
               tDriverPayDays = new TDriverPayDays();
               tDriverPayDays.setUpdateTime(new Date());
               tDriverPayDays.setDay(driverDays);
               driverPayDaysService.insert(tDriverPayDays);
            }
        }

        //积分设置
        if("integralSet".equals(type)){
            TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
           TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(integral)){
            integral.setOpenCityId(openCityId);
                integral.setIntegral(two);
                tSysIntegralService.updateById(integral);
            }else{
                integral = new TSysIntegral();
                integral.setCompanyId(ShiroKit.getUser().getObjectId());
                integral.setIntegral(two);
                tSysIntegralService.insert(integral);
            }else {
               integral = new TSysIntegral();
               integral.setOpenCityId(openCityId);
               integral.setIntegral(two);
               tSysIntegralService.insert(integral);
            }
        }

        //人脸识别
        if("faceRecognitionSettings".equals(type)){
            TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
           TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            if (SinataUtil.isNotEmpty(faceDistinguish)){
            faceDistinguish.setOpenCityId(openCityId);
                faceDistinguish.setIsOpen(three);
                faceDistinguish.setMinuteNum(openValue);
                tSysFaceDistinguishService.updateById(faceDistinguish);
            }else{
                faceDistinguish = new TSysFaceDistinguish();
                faceDistinguish.setIsOpen(three);
                faceDistinguish.setMinuteNum(openValue);
                faceDistinguish.setCompanyId(ShiroKit.getUser().getObjectId());
                tSysFaceDistinguishService.insert(faceDistinguish);
            }else {
               faceDistinguish = new TSysFaceDistinguish();
               faceDistinguish.setIsOpen(three);
               faceDistinguish.setMinuteNum(openValue);
               faceDistinguish.setOpenCityId(openCityId);
               tSysFaceDistinguishService.insert(faceDistinguish);
            }
        }

        //推单设置
        if("pushOrderSettings".equals(type)){
            //快车推单(第一轮)
            TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
           TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
            if (SinataUtil.isNotEmpty(zcOne)){
            zcOne.setOpenCityId(openCityId);
                zcOne.setPushDistance(zc1);
                zcOne.setPushTime(zc2);
                zcOne.setDriverProportion(zc3);
                tSysPushOrderService.updateById(zcOne);
            }else{
                zcOne = new TSysPushOrder();
                zcOne.setPushDistance(zc1);
                zcOne.setPushTime(zc2);
                zcOne.setDriverProportion(zc3);
                zcOne.setCompanyId(ShiroKit.getUser().getObjectId());
                zcOne.setPushType(1);
                zcOne.setType(1);
                tSysPushOrderService.insert(zcOne);
            }else {
               zcOne = new TSysPushOrder();
               zcOne.setPushDistance(zc1);
               zcOne.setPushTime(zc2);
               zcOne.setDriverProportion(zc3);
               zcOne.setOpenCityId(openCityId);
               zcOne.setPushType(1);
               zcOne.setType(1);
               tSysPushOrderService.insert(zcOne);
            }
            //快车推单(第二轮)
            TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
           TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
            if (SinataUtil.isNotEmpty(zcTwo)){
            zcTwo.setOpenCityId(openCityId);
                zcTwo.setPushDistance(zc4);
                zcTwo.setPushTime(zc5);
                zcTwo.setDriverProportion(zc6);
                tSysPushOrderService.updateById(zcTwo);
            }else{
                zcTwo = new TSysPushOrder();
                zcTwo.setPushDistance(zc4);
                zcTwo.setPushTime(zc5);
                zcTwo.setDriverProportion(zc6);
                zcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                zcTwo.setPushType(1);
                zcTwo.setType(2);
                tSysPushOrderService.insert(zcTwo);
            }else {
               zcTwo = new TSysPushOrder();
               zcTwo.setPushDistance(zc4);
               zcTwo.setPushTime(zc5);
               zcTwo.setDriverProportion(zc6);
               zcTwo.setOpenCityId(openCityId);
               zcTwo.setPushType(1);
               zcTwo.setType(2);
               tSysPushOrderService.insert(zcTwo);
            }
            //快车推单(第三轮)
            TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
           TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
            if (SinataUtil.isNotEmpty(zcThree)){
            zcThree.setOpenCityId(openCityId);
                zcThree.setPushDistance(zc7);
                zcThree.setPushTime(zc8);
                zcThree.setDriverProportion(zc9);
                tSysPushOrderService.updateById(zcThree);
            }else{
                zcThree = new TSysPushOrder();
                zcThree.setPushDistance(zc7);
                zcThree.setPushTime(zc8);
                zcThree.setDriverProportion(zc9);
                zcThree.setCompanyId(ShiroKit.getUser().getObjectId());
                zcThree.setPushType(1);
                zcThree.setType(3);
                tSysPushOrderService.insert(zcThree);
            }else {
               zcThree = new TSysPushOrder();
               zcThree.setPushDistance(zc7);
               zcThree.setPushTime(zc8);
               zcThree.setDriverProportion(zc9);
               zcThree.setOpenCityId(openCityId);
               zcThree.setPushType(1);
               zcThree.setType(3);
               tSysPushOrderService.insert(zcThree);
            }

            //出租车推单(第一轮)
            TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
           TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
            if (SinataUtil.isNotEmpty(czcOne)){
            czcOne.setOpenCityId(openCityId);
                czcOne.setPushDistance(czc1);
                czcOne.setPushTime(czc2);
                czcOne.setDriverProportion(czc3);
                tSysPushOrderService.updateById(czcOne);
            }else{
                czcOne = new TSysPushOrder();
                czcOne.setPushDistance(czc1);
                czcOne.setPushTime(czc2);
                czcOne.setDriverProportion(czc3);
                czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
                czcOne.setPushType(2);
                czcOne.setType(1);
                tSysPushOrderService.insert(czcOne);
            }else {
               czcOne = new TSysPushOrder();
               czcOne.setPushDistance(czc1);
               czcOne.setPushTime(czc2);
               czcOne.setDriverProportion(czc3);
               czcOne.setOpenCityId(openCityId);
               czcOne.setPushType(2);
               czcOne.setType(1);
               tSysPushOrderService.insert(czcOne);
            }
            //出租车推单(第二轮)
            TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
           TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
            if (SinataUtil.isNotEmpty(czcTwo)){
            czcTwo.setOpenCityId(openCityId);
                czcTwo.setPushDistance(czc4);
                czcTwo.setPushTime(czc5);
                czcTwo.setDriverProportion(czc6);
                tSysPushOrderService.updateById(czcTwo);
            }else{
                czcTwo = new TSysPushOrder();
                czcTwo.setPushDistance(czc4);
                czcTwo.setPushTime(czc5);
                czcTwo.setDriverProportion(czc6);
                czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                czcTwo.setPushType(2);
                czcTwo.setType(2);
                tSysPushOrderService.insert(czcTwo);
            }else {
               czcTwo = new TSysPushOrder();
               czcTwo.setPushDistance(czc4);
               czcTwo.setPushTime(czc5);
               czcTwo.setDriverProportion(czc6);
               czcTwo.setOpenCityId(openCityId);
               czcTwo.setPushType(2);
               czcTwo.setType(2);
               tSysPushOrderService.insert(czcTwo);
            }
            //出租车推单(第三轮)
            TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
           TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
            if (SinataUtil.isNotEmpty(czcThree)){
            czcThree.setOpenCityId(openCityId);
                czcThree.setPushDistance(czc7);
                czcThree.setPushTime(czc8);
                czcThree.setDriverProportion(czc9);
                tSysPushOrderService.updateById(czcThree);
            }else{
                czcThree = new TSysPushOrder();
                czcThree.setPushDistance(czc7);
                czcThree.setPushTime(czc8);
                czcThree.setDriverProportion(czc9);
                czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
                czcThree.setPushType(2);
                czcThree.setType(3);
                tSysPushOrderService.insert(czcThree);
            }else {
               czcThree = new TSysPushOrder();
               czcThree.setPushDistance(czc7);
               czcThree.setPushTime(czc8);
               czcThree.setDriverProportion(czc9);
               czcThree.setOpenCityId(openCityId);
               czcThree.setPushType(2);
               czcThree.setType(3);
               tSysPushOrderService.insert(czcThree);
            }
        }

        //取消设置
        if("cancelOrderSettings".equals(type)){
            //普通取消设置(快车)
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
           TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(ptCancelOne)){
            ptCancelOne.setOpenCityId(openCityId);
                ptCancelOne.setMinuteNum(ptCancel1);
                ptCancelOne.setMoney(ptCancel2);
                tSysCancleOrderService.updateById(ptCancelOne);
            }else{
                ptCancelOne = new TSysCancleOrder();
                ptCancelOne.setMinuteNum(ptCancel1);
                ptCancelOne.setMoney(ptCancel2);
                ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
                ptCancelOne.setType(1);
                ptCancelOne.setOrderType(1);
                tSysCancleOrderService.insert(ptCancelOne);
            }else {
               ptCancelOne = new TSysCancleOrder();
               ptCancelOne.setMinuteNum(ptCancel1);
               ptCancelOne.setMoney(ptCancel2);
               ptCancelOne.setOpenCityId(openCityId);
               ptCancelOne.setType(1);
               ptCancelOne.setOrderType(1);
               tSysCancleOrderService.insert(ptCancelOne);
            }

            //普通取消设置(出租车)
            TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
           TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(ptCancelTwo)){
            ptCancelTwo.setOpenCityId(openCityId);
                ptCancelTwo.setMinuteNum(ptCancel3);
                ptCancelTwo.setMoney(ptCancel4);
                tSysCancleOrderService.updateById(ptCancelTwo);
            }else{
                ptCancelTwo = new TSysCancleOrder();
                ptCancelTwo.setMinuteNum(ptCancel3);
                ptCancelTwo.setMoney(ptCancel4);
                ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                ptCancelTwo.setType(1);
                ptCancelTwo.setOrderType(2);
                tSysCancleOrderService.insert(ptCancelTwo);
            }else {
               ptCancelTwo = new TSysCancleOrder();
               ptCancelTwo.setMinuteNum(ptCancel3);
               ptCancelTwo.setMoney(ptCancel4);
               ptCancelTwo.setOpenCityId(openCityId);
               ptCancelTwo.setType(1);
               ptCancelTwo.setOrderType(2);
               tSysCancleOrderService.insert(ptCancelTwo);
            }

            //普通取消设置(跨城出行)
            TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
           TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
            if (SinataUtil.isNotEmpty(ptCancelThree)){
            ptCancelThree.setOpenCityId(openCityId);
                ptCancelThree.setMinuteNum(ptCancel5);
                ptCancelThree.setMoney(ptCancel6);
                tSysCancleOrderService.updateById(ptCancelThree);
            }else{
                ptCancelThree = new TSysCancleOrder();
                ptCancelThree.setMinuteNum(ptCancel5);
                ptCancelThree.setMoney(ptCancel6);
                ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
                ptCancelThree.setType(1);
                ptCancelThree.setOrderType(3);
                tSysCancleOrderService.insert(ptCancelThree);
            }else {
               ptCancelThree = new TSysCancleOrder();
               ptCancelThree.setMinuteNum(ptCancel5);
               ptCancelThree.setMoney(ptCancel6);
               ptCancelThree.setOpenCityId(openCityId);
               ptCancelThree.setType(1);
               ptCancelThree.setOrderType(3);
               tSysCancleOrderService.insert(ptCancelThree);
            }
        }

        //预约取消设置
        if("cancelTheReservationOrderSetting".equals(type)){
            //预约取消设置(快车)
            TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
           TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(yyCancelOne)){
            yyCancelOne.setOpenCityId(openCityId);
                yyCancelOne.setMinuteNum(yyCancel1);
                yyCancelOne.setMoney(yyCancel2);
                tSysCancleOrderService.updateById(yyCancelOne);
            }else{
                yyCancelOne = new TSysCancleOrder();
                yyCancelOne.setMinuteNum(yyCancel1);
                yyCancelOne.setMoney(yyCancel2);
                yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
                yyCancelOne.setType(2);
                yyCancelOne.setOrderType(1);
                tSysCancleOrderService.insert(yyCancelOne);
            }else {
               yyCancelOne = new TSysCancleOrder();
               yyCancelOne.setMinuteNum(yyCancel1);
               yyCancelOne.setMoney(yyCancel2);
               yyCancelOne.setOpenCityId(openCityId);
               yyCancelOne.setType(2);
               yyCancelOne.setOrderType(1);
               tSysCancleOrderService.insert(yyCancelOne);
            }
            //预约取消设置(出租车)
            TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
           TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(yyCancelTwo)){
            yyCancelTwo.setOpenCityId(openCityId);
                yyCancelTwo.setMinuteNum(yyCancel3);
                yyCancelTwo.setMoney(yyCancel4);
                tSysCancleOrderService.updateById(yyCancelTwo);
            }else{
                yyCancelTwo = new TSysCancleOrder();
                yyCancelTwo.setMinuteNum(yyCancel3);
                yyCancelTwo.setMoney(yyCancel4);
                yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                yyCancelTwo.setType(2);
                yyCancelTwo.setOrderType(2);
                tSysCancleOrderService.insert(yyCancelTwo);
            }else {
               yyCancelTwo = new TSysCancleOrder();
               yyCancelTwo.setMinuteNum(yyCancel3);
               yyCancelTwo.setMoney(yyCancel4);
               yyCancelTwo.setOpenCityId(openCityId);
               yyCancelTwo.setType(2);
               yyCancelTwo.setOrderType(2);
               tSysCancleOrderService.insert(yyCancelTwo);
            }
        }

        //拼单派单
        if("spellOrderSetting".equals(type)){
            SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", ShiroKit.getUser().getObjectId()));
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("num1", pdpd1);
            jsonObject.put("num2", pdpd2);
            jsonObject.put("num3", pdpd3);
            jsonObject.put("num4", pdpd4);
            jsonObject.put("num5", pdpd5);
            jsonObject.put("num6", pdpd6);
            if(SinataUtil.isNotEmpty(spellOrderRule)){
                spellOrderRule.setContent(jsonObject.toJSONString());
                spellOrderRuleService.updateById(spellOrderRule);
            }else{
                spellOrderRule = new SpellOrderRule();
                spellOrderRule.setCompanyId(ShiroKit.getUser().getObjectId());
                spellOrderRule.setContent(jsonObject.toJSONString());
                spellOrderRuleService.insert(spellOrderRule);
            }
        if("spellOrderSetting".equals(type)) {
           SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
           JSONObject jsonObject = new JSONObject();
           jsonObject.put("num1", pdpd1);
           jsonObject.put("num2", pdpd2);
           jsonObject.put("num3", pdpd3);
           jsonObject.put("num4", pdpd4);
           jsonObject.put("num5", pdpd5);
           jsonObject.put("num6", pdpd6);
           if (SinataUtil.isNotEmpty(spellOrderRule)) {
            spellOrderRule.setOpenCityId(openCityId);
              spellOrderRule.setContent(jsonObject.toJSONString());
              spellOrderRuleService.updateById(spellOrderRule);
           } else {
              spellOrderRule = new SpellOrderRule();
              spellOrderRule.setOpenCityId(openCityId);
              spellOrderRule.setContent(jsonObject.toJSONString());
              spellOrderRuleService.insert(spellOrderRule);
           }
        }

        //电话设置
        if("phoneSettings".equals(type)){
            //报警电话
            TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
           TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
            if (SinataUtil.isNotEmpty(phoneOne)){
               phoneOne.setOpenCityId(openCityId);
                phoneOne.setPhone(phone1);
                tPhoneService.updateById(phoneOne);
            }else{
                phoneOne = new TPhone();
                phoneOne.setPhone(phone1);
                phoneOne.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneOne.setType(1);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneOne.setPlatform(1);
                }else{
                    phoneOne.setPlatform(2);
                }
                tPhoneService.insert(phoneOne);
            }else {
               phoneOne = new TPhone();
               phoneOne.setPhone(phone1);
               phoneOne.setOpenCityId(openCityId);
               phoneOne.setType(1);
               if (shiroExtUtil.getUser().getRoleType() == 1) {
                  phoneOne.setPlatform(1);
               } else {
                  phoneOne.setPlatform(2);
               }
               tPhoneService.insert(phoneOne);
            }
            //客服电话
            TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
           TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
            if (SinataUtil.isNotEmpty(phoneTwo)){
            phoneTwo.setOpenCityId(openCityId);
                phoneTwo.setPhone(phone2);
                tPhoneService.updateById(phoneTwo);
            }else{
                phoneTwo = new TPhone();
                phoneTwo.setPhone(phone2);
                phoneTwo.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneTwo.setType(2);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneTwo.setPlatform(1);
                }else{
                    phoneTwo.setPlatform(2);
                }
                tPhoneService.insert(phoneTwo);
            }else {
               phoneTwo = new TPhone();
               phoneTwo.setPhone(phone2);
               phoneTwo.setOpenCityId(openCityId);
               phoneTwo.setType(2);
               if (shiroExtUtil.getUser().getRoleType() == 1) {
                  phoneTwo.setPlatform(1);
               } else {
                  phoneTwo.setPlatform(2);
               }
               tPhoneService.insert(phoneTwo);
            }

            //客服电话
            TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
           TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
            if (SinataUtil.isNotEmpty(phone)){
            phone.setOpenCityId(openCityId);
                phone.setPhone(phone3);
                tPhoneService.updateById(phone);
            }else{
                phone = new TPhone();
                phone.setPhone(phone3);
                phone.setCompanyId(ShiroKit.getUser().getObjectId());
                phone.setType(3);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phone.setPlatform(1);
                }else{
                    phone.setPlatform(2);
                }
                tPhoneService.insert(phone);
            }else {
               phone = new TPhone();
               phone.setPhone(phone3);
               phone.setOpenCityId(openCityId);
               phone.setType(3);
               if (shiroExtUtil.getUser().getRoleType() == 1) {
                  phone.setPlatform(1);
               } else {
                  phone.setPlatform(2);
               }
               tPhoneService.insert(phone);
            }

            //招聘电话
            TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 5));
           TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 5));
            if (SinataUtil.isNotEmpty(phoneFive)){
            phoneFive.setOpenCityId(openCityId);
                phoneFive.setPhone(phone5);
                tPhoneService.updateById(phoneFive);
            }else{
                phoneFive = new TPhone();
                phoneFive.setPhone(phone5);
                phoneFive.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneFive.setType(5);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneFive.setPlatform(1);
                }else{
                    phoneFive.setPlatform(2);
                }
                tPhoneService.insert(phoneFive);
            }else {
               phoneFive = new TPhone();
               phoneFive.setPhone(phone5);
               phoneFive.setOpenCityId(openCityId);
               phoneFive.setType(5);
               if (shiroExtUtil.getUser().getRoleType() == 1) {
                  phoneFive.setPlatform(1);
               } else {
                  phoneFive.setPlatform(2);
               }
               tPhoneService.insert(phoneFive);
            }
        }

        //95128
        if("95128TheOnCall".equals(type)){
            //95128电召电话
            TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 4));
           TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 4));
            if (SinataUtil.isNotEmpty(phoneFour)){
            phoneFour.setOpenCityId(openCityId);
                phoneFour.setPhone(phone4);
                tPhoneService.updateById(phoneFour);
            }else{
                phoneFour = new TPhone();
                phoneFour.setPhone(phone4);
                phoneFour.setCompanyId(ShiroKit.getUser().getObjectId());
                phoneFour.setType(4);
                if (ShiroKit.getUser().getRoleType() == 1){
                    phoneFour.setPlatform(1);
                }else{
                    phoneFour.setPlatform(2);
                }
                tPhoneService.insert(phoneFour);
            }else {
               phoneFour = new TPhone();
               phoneFour.setPhone(phone4);
               phoneFour.setOpenCityId(openCityId);
               phoneFour.setType(4);
               if (shiroExtUtil.getUser().getRoleType() == 1) {
                  phoneFour.setPlatform(1);
               } else {
                  phoneFour.setPlatform(2);
               }
               tPhoneService.insert(phoneFour);
            }
        }


        ///  节假日服务费
        if("holidayServiceFeeSetting".equals(type)){
            Integer companyId = ShiroKit.getUser().getObjectId();
            TCompany company = companyService.selectById(companyId);
            company.setHolidayFee(holidayFee);
            companyService.updateById(company);
        if("holidayServiceFeeSetting".equals(type)) {
           Integer companyId = shiroExtUtil.getUser().getObjectId();
           TCompany company = companyService.selectById(companyId);
           company.setHolidayFee(holidayFee);
           companyService.updateById(company);
        }


@@ -750,6 +721,7 @@
        if("timeoutDeductionSettings".equals(type)){
            timeoutMoneyService.delete(new EntityWrapper<TSysTimeoutMoney>().ne("id",0));
            TSysTimeoutMoney tSysTimeoutMoney = new TSysTimeoutMoney();
         tSysTimeoutMoney.setOpenCityId(openCityId);
            tSysTimeoutMoney.setDeductMoney(deductMoney);
            tSysTimeoutMoney.setTimeOut(timeOut);
            timeoutMoneyService.insert(tSysTimeoutMoney);
@@ -773,10 +745,12 @@
                showModular1.setType(1);
                showModular1.setDriverShow(sjzp2);
                showModular1.setUserShow(sjzp1);
            showModular1.setOpenCityId(openCityId);
                showModularService.insert(showModular1);
            }else{
                showModular1.setDriverShow(sjzp2);
                showModular1.setUserShow(sjzp1);
            showModular1.setOpenCityId(openCityId);
                showModularService.updateById(showModular1);
            }
            //租车
@@ -786,10 +760,12 @@
                showModular2.setType(2);
                showModular2.setDriverShow(zuc2);
                showModular2.setUserShow(zuc1);
            showModular2.setOpenCityId(openCityId);
                showModularService.insert(showModular2);
            }else{
                showModular2.setDriverShow(zuc2);
                showModular2.setUserShow(zuc1);
            showModular2.setOpenCityId(openCityId);
                showModularService.updateById(showModular2);
            }
            //买车
@@ -799,10 +775,12 @@
                showModular3.setType(3);
                showModular3.setDriverShow(mc2);
                showModular3.setUserShow(mc1);
            showModular3.setOpenCityId(openCityId);
                showModularService.insert(showModular3);
            }else{
                showModular3.setDriverShow(mc2);
                showModular3.setUserShow(mc1);
            showModular3.setOpenCityId(openCityId);
                showModularService.updateById(showModular3);
            }
            //出租个人车辆
@@ -812,10 +790,12 @@
                showModular4.setType(4);
                showModular4.setDriverShow(czgrcl2);
                showModular4.setUserShow(czgrcl1);
            showModular4.setOpenCityId(openCityId);
                showModularService.insert(showModular4);
            }else{
                showModular4.setDriverShow(czgrcl2);
                showModular4.setUserShow(czgrcl1);
            showModular4.setOpenCityId(openCityId);
                showModularService.updateById(showModular4);
            }
            //卖车
@@ -825,10 +805,12 @@
                showModular5.setType(5);
                showModular5.setDriverShow(mac2);
                showModular5.setUserShow(mac1);
            showModular5.setOpenCityId(openCityId);
                showModularService.insert(showModular5);
            }else{
                showModular5.setDriverShow(mac2);
                showModular5.setUserShow(mac1);
            showModular5.setOpenCityId(openCityId);
                showModularService.updateById(showModular5);
            }
            //商家中心
@@ -838,10 +820,12 @@
                showModular6.setType(6);
                showModular6.setDriverShow(sjzx2);
                showModular6.setUserShow(sjzx1);
            showModular6.setOpenCityId(openCityId);
                showModularService.insert(showModular6);
            }else{
                showModular6.setDriverShow(sjzx2);
                showModular6.setUserShow(sjzx1);
            showModular6.setOpenCityId(openCityId);
                showModularService.updateById(showModular6);
            }
            //打车卡
@@ -851,10 +835,12 @@
                showModular7.setType(7);
                showModular7.setDriverShow(dck2);
                showModular7.setUserShow(dck1);
            showModular7.setOpenCityId(openCityId);
                showModularService.insert(showModular7);
            }else{
                showModular7.setDriverShow(dck2);
                showModular7.setUserShow(dck1);
            showModular7.setOpenCityId(openCityId);
                showModularService.updateById(showModular7);
            }
        }