igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
2025-05-16 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc 
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java


@@ -1,7 +1,11 @@


package com.stylefeng.guns.modular.system.controller.general;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.plugins.Page;


import com.stylefeng.guns.core.base.controller.BaseController;


import com.stylefeng.guns.core.common.constant.factory.PageFactory;


import com.stylefeng.guns.core.shiro.ShiroKit;


import com.stylefeng.guns.core.util.SinataUtil;


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


@@ -16,7 +20,13 @@


import org.springframework.web.bind.annotation.RequestParam;




import java.math.BigDecimal;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




/**


 * 系统设置控制器


@@ -53,8 +63,141 @@




    @Autowired


    private IDriverAssessmentService driverAssessmentService;


    @Autowired


    private ITSysOverTimeService sysOverTimeService;


    @Autowired


    private IRedEnvelopePaymentSettingsService redEnvelopePaymentSettingsService;




    /**


     * 2.0新增红包支付设置


     * @return


     */


    @RequestMapping("/redSet")


    public String redPackageSet() {


        return PREFIX + "tRedSet.html";


    }


    @RequestMapping("/redSet/addHtml")


    public String addHtml(Model model) {


        List<String> strings = new ArrayList<>();


        strings.add("updateTime");


        // 查询生效的红包折扣比例


        List<RedEnvelopePaymentSettings> isDelete = redEnvelopePaymentSettingsService.selectList(new EntityWrapper<RedEnvelopePaymentSettings>()


                .eq("status", 1)


                .orderDesc(strings));


        if (isDelete.size()>0){


            model.addAttribute("new",isDelete.get(0).getDeductionRatio());


        }else{


            model.addAttribute("new","_");


        }


        return PREFIX + "tRedSetAdd.html";


    }


    @RequestMapping("/redSet/updateHtml/{id}")


    public String updateHtml(@PathVariable("id") Integer id,Model model) {


        RedEnvelopePaymentSettings tSysRedSet = redEnvelopePaymentSettingsService.selectById(id);


        List<String> strings = new ArrayList<>();


        strings.add("updateTime");


        // 查询生效的红包折扣比例


        List<RedEnvelopePaymentSettings> isDelete = redEnvelopePaymentSettingsService.selectList(new EntityWrapper<RedEnvelopePaymentSettings>()


                .eq("status", 1)


                .orderDesc(strings));


        if (isDelete.size()>0){


            model.addAttribute("new",isDelete.get(0).getDeductionRatio());


        }else{


            model.addAttribute("new","_");


        }


        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");


        String format = simpleDateFormat.format(tSysRedSet.getEffectiveDate());




        model.addAttribute("time",format);


        model.addAttribute("data",tSysRedSet);


        return PREFIX + "tRedSetEdit.html";


    }




    @Autowired


    private ISysRedSetService sysRedSetService;


    /**


     * 红包支付设置记录


     */


    @RequestMapping(value = "/redSet/list")


    @ResponseBody


    public Object redSetList() {


        List<String> strings = new ArrayList<>();


        strings.add("updateTime");


        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();


        if (ShiroKit.getUser().getRoleType() != 1){


            page.setRecords(null);


        }else{


            List<Map<String, Object>> list = sysRedSetService.getList(page);


            for (Map<String, Object> stringObjectMap : list) {


                stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");


            }


            List<Map<String, Object>> sortedList = list.stream()


                    .sorted((map1, map2) -> {


                        // 获取 updateTime 字段


                        String time1 = map1.get("updateTime").toString();


                        String time2 = map2.get("updateTime").toString();


                        // 倒序排列


                        return time2.compareTo(time1);


                    })


                    .collect(Collectors.toList());


            page.setRecords(sortedList);


        }


        return super.packForBT(page);


    }


    @RequestMapping(value = "/redSet/add")


    @ResponseBody


    public Object redSetAdd(String proportion, String startTime) throws ParseException {


        // 新增红包设置


        RedEnvelopePaymentSettings tSysRedSet = new RedEnvelopePaymentSettings();


        RedEnvelopePaymentSettings redEnvelopePaymentSettings = new RedEnvelopePaymentSettings();


        String name = ShiroKit.getUser().getName();




        tSysRedSet.setInsertUserId(ShiroKit.getUser().getId());




        tSysRedSet.setDeductionRatio(new BigDecimal(proportion));


        String replace = startTime.replace("T", " ");


        String s = replace + ":00";


        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        Date date = dateFormat.parse(s);


        if (date.before(new Date())){


            // 选择的生效时间不能小于当前时间


            return 501;


        }


        tSysRedSet.setInsertTime(new Date());


        tSysRedSet.setUpdateTime(new Date());


        tSysRedSet.setEffectiveDate(date);


        tSysRedSet.setStatus(1);


        redEnvelopePaymentSettingsService.insert(tSysRedSet);


        return SUCCESS_TIP;


    }




    @RequestMapping(value = "/redSet/update")


    @ResponseBody


    public Object redSetUpdate(Integer id,String proportion, String startTime) throws ParseException {


        // 修改红包设置


        RedEnvelopePaymentSettings tSysRedSet = redEnvelopePaymentSettingsService.selectById(id);


        String name = ShiroKit.getUser().getName();


        tSysRedSet.setInsertUserId(ShiroKit.getUser().getId());


        tSysRedSet.setDeductionRatio(new BigDecimal(proportion));


        String replace = startTime.replace("T", " ");


        String s = replace + ":00";


        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        Date date = dateFormat.parse(s);


        tSysRedSet.setEffectiveDate(date);


        tSysRedSet.setUpdateTime(new Date());


        redEnvelopePaymentSettingsService.updateById(tSysRedSet);


        return SUCCESS_TIP;


    }




    @RequestMapping(value = "/redSet/delete")


    @ResponseBody


    public Object redSetDelete(Integer id) {


        // 删除红包设置


        RedEnvelopePaymentSettings tSysRedSet = redEnvelopePaymentSettingsService.selectById(id);


        tSysRedSet.setStatus(3);


        redEnvelopePaymentSettingsService.updateById(tSysRedSet);


        return SUCCESS_TIP;


    }


    /**


     * 跳转到系统设置首页


     */


@@ -98,20 +241,84 @@


        model.addAttribute("czcAssignOrder", czcAssignOrder);




        //普通取消设置(专车)


        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", ShiroKit.getUser().getObjectId()));


        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", ShiroKit.getUser().getObjectId()));


        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", ShiroKit.getUser().getObjectId()));


        model.addAttribute("ptCancel3",ptCancel3);




        // 司机超时


        if(null != ptCancel1){


            JSONObject jsonObject = JSON.parseObject(ptCancel1.getContent());


            model.addAttribute("driverTimeout",jsonObject.getIntValue("driverTimeout"));


            // 订单取消规则


            JSONObject order = jsonObject.getJSONObject("order");


            String orderAcceptanceTime = order.getString("orderAcceptanceTime");


            String money = order.getString("money");


            String mileageFee = order.getString("mileageFee");


            String durationFee = order.getString("durationFee");


            // 接单xx分钟后


            model.addAttribute("orderAcceptanceTime",orderAcceptanceTime);


            // 取消订单金额


            model.addAttribute("money",money);


            // 时长费


            model.addAttribute("mileageFee",mileageFee);


            // 分钟


            model.addAttribute("durationFee",durationFee);


            // 预约单取消规则


            JSONObject reservationOrder = jsonObject.getJSONObject("reservationOrder");


            String orderAcceptanceTime1 = reservationOrder.getString("orderAcceptanceTime");


            String money1 = reservationOrder.getString("money");


            String mileageFee1 = reservationOrder.getString("mileageFee");


            String durationFee1 = reservationOrder.getString("durationFee");


            String reservationFee = reservationOrder.getString("reservationFee");


            // 预约单接单xx分钟后


            model.addAttribute("orderAcceptanceTime1",orderAcceptanceTime1);


            // 预约单取消订单金额


            model.addAttribute("money1",money1);


            // 预约单时长费


            model.addAttribute("mileageFee1",mileageFee1);


            // 预约单分钟


            model.addAttribute("durationFee1",durationFee1);


            // 预定费用


            model.addAttribute("reservationFee",reservationFee);


        }else{


            model.addAttribute("driverTimeout", "");


            // 接单xx分钟后


            model.addAttribute("orderAcceptanceTime", "");


            // 取消订单金额


            model.addAttribute("money","");


            // 时长费


            model.addAttribute("mileageFee","");


            // 分钟


            model.addAttribute("durationFee","");


            // 预约单取消规则


            // 预约单接单xx分钟后


            model.addAttribute("orderAcceptanceTime1","");


            // 预约单取消订单金额


            model.addAttribute("money1","");


            // 预约单时长费


            model.addAttribute("mileageFee1","");


            // 预约单分钟


            model.addAttribute("durationFee1","");


            // 预定费用


            model.addAttribute("reservationFee","");


        }


        // 超时设置




        TSysOverTime overTime = sysOverTimeService.selectOne(new EntityWrapper<TSysOverTime>().eq("companyId", ShiroKit.getUser().getObjectId()));


        model.addAttribute("overTime",overTime);




        //预约取消设置(专车)


        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", ShiroKit.getUser().getObjectId()));


        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", ShiroKit.getUser().getObjectId()));


        model.addAttribute("yyCancel2",yyCancel2);




        //报警电话


@@ -126,6 +333,8 @@


        //司机考勤


        DriverAssessment driverAssessment = driverAssessmentService.selectOne(new EntityWrapper<DriverAssessment>().eq("companyId", ShiroKit.getUser().getObjectId()));


        model.addAttribute("assessment", driverAssessment == null ? "" : driverAssessment.getAssessment());






        return PREFIX + "tSysReformist.html";


    }




@@ -140,14 +349,21 @@


                        @RequestParam Double zc1,@RequestParam Integer zc2,@RequestParam Double zc3,


                        @RequestParam Double zc4,@RequestParam Integer zc5,@RequestParam Double zc6,


                        @RequestParam Double zc7,@RequestParam Integer zc8,@RequestParam Double zc9,


                        @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,


                        @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,


                        @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,


                        @RequestParam Double zcAssignOrder,@RequestParam Double czcAssignOrder,


                        @RequestParam Integer zcPeople,@RequestParam Integer czcPeople,


                        @RequestParam Integer ptCancel1,@RequestParam BigDecimal ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,


                        @RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,


                        @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3, @RequestParam String assessment) {


//                        @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,


//                        @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,


//                        @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,


                        @RequestParam Double zcAssignOrder,/*@RequestParam Double czcAssignOrder,*/


                        @RequestParam Integer zcPeople,/*@RequestParam Integer czcPeople,*/


                        @RequestParam Integer ptCancel1,@RequestParam String ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,


                        @RequestParam Integer yyCancel1,@RequestParam String yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,


                        @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3,@RequestParam String assessment,




                        @RequestParam String km,@RequestParam String kmMinute,@RequestParam String km2,


                        @RequestParam String kmMinute2,


                        @RequestParam Integer overtime,@RequestParam Integer overtime1,@RequestParam Integer packageTime,


                        @RequestParam Integer reserveTime,


                        @RequestParam Integer reserveNext,@RequestParam String reserveMoney


                        ) {


        //改派设置


        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));


        if (SinataUtil.isNotEmpty(reformist)){


@@ -257,149 +473,243 @@


        }




        //出租车推单(第一轮)


        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));


        if (SinataUtil.isNotEmpty(czcOne)){


            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);


//        TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));


//        if (SinataUtil.isNotEmpty(czcOne)){


//            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);


//        }


//        //出租车推单(第二轮)


//        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));


//        if (SinataUtil.isNotEmpty(czcTwo)){


//            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);


//        }


//        //出租车推单(第三轮)


//        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));


//        if (SinataUtil.isNotEmpty(czcThree)){


//            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);


//        }


//        //出租车指派


//        AssignOrder assignOrder1 = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));


//        if(SinataUtil.isNotEmpty(assignOrder1)){


//            assignOrder1.setDistance(czcAssignOrder);


//            assignOrder.setPeople(czcPeople);


//            assignOrderService.updateById(assignOrder1);


//        }else{


//            assignOrder1 = new AssignOrder();


//            assignOrder1.setCompanyId(ShiroKit.getUser().getObjectId());


//            assignOrder1.setType(2);


//            assignOrder1.setDistance(czcAssignOrder);


//            assignOrder.setPeople(czcPeople);


//            assignOrderService.insert(assignOrder1);


//        }


        TSysCancleOrder cancleOrder = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()));


        // {"order":{"orderAcceptanceTime":5,"money":2.5,"mileageFee":1,"durationFee":0.5},"reservationOrder":{"orderAcceptanceTime":5,"money":2.5,"mileageFee":1,"durationFee":0.5,"reservationFee":5},"driverTimeout":10}


        // 将数据拼接为json格式存储


        if (ptCancel1 == null){


            ptCancel1 = 0;


        }


        //出租车推单(第二轮)


        TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));


        if (SinataUtil.isNotEmpty(czcTwo)){


            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);


        if (ptCancel2 == null){


            ptCancel2 = "0";


        }


        //出租车推单(第三轮)


        TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));


        if (SinataUtil.isNotEmpty(czcThree)){


            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);


        if (yyCancel2 == null){


            yyCancel2 = "0";


        }


        //出租车指派


        AssignOrder assignOrder1 = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));


        if(SinataUtil.isNotEmpty(assignOrder1)){


            assignOrder1.setDistance(czcAssignOrder);


            assignOrder.setPeople(czcPeople);


            assignOrderService.updateById(assignOrder1);


        }else{


            assignOrder1 = new AssignOrder();


            assignOrder1.setCompanyId(ShiroKit.getUser().getObjectId());


            assignOrder1.setType(2);


            assignOrder1.setDistance(czcAssignOrder);


            assignOrder.setPeople(czcPeople);


            assignOrderService.insert(assignOrder1);


        if (yyCancel1 == null){


            yyCancel1 = 0;


        }




        //普通取消设置(专车)


        TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));


        if (SinataUtil.isNotEmpty(ptCancelOne)){


            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);


        if (km == null){


            km = "0";


        }if (kmMinute == null){


            kmMinute = "0";


        }




        //普通取消设置(出租车)


        TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));


        if (SinataUtil.isNotEmpty(ptCancelTwo)){


            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);


        if (km2 == null){


            km2 = "0";


        }if (kmMinute2 == null){


            kmMinute2 = "0";


        }if (reserveMoney == null){


            reserveMoney = "0";


        }if (overtime == null){


            overtime = 0;


        }




        //普通取消设置(跨城出行)


        TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));


        if (SinataUtil.isNotEmpty(ptCancelThree)){


            ptCancelThree.setMinuteNum(ptCancel5);


            ptCancelThree.setMoney(ptCancel6);


            tSysCancleOrderService.updateById(ptCancelThree);


        String result = "{\""+"order\":{\"orderAcceptanceTime\":"+ptCancel1+","+"\"money\":"+ptCancel2+","+"\"mileageFee\":"+km+","+"\"durationFee\":"+kmMinute+"},"+"\"reservationOrder\":{\"orderAcceptanceTime\":"+yyCancel1+","+"\"money\":"+yyCancel2+","+"\"mileageFee\":"+km2+","+"\"durationFee\":"+kmMinute2+","+"\"reservationFee\":"+reserveMoney+"},"+"\"driverTimeout\":"+overtime+"}";


        System.err.println("看看");


        System.err.println(result);


        if(null != cancleOrder){


            cancleOrder.setContent(result);


            tSysCancleOrderService.updateById(cancleOrder);


        }else{


            ptCancelThree = new TSysCancleOrder();


            ptCancelThree.setMinuteNum(ptCancel5);


            ptCancelThree.setMoney(ptCancel6);


            ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());


            ptCancelThree.setType(1);


            ptCancelThree.setOrderType(3);


            tSysCancleOrderService.insert(ptCancelThree);


            cancleOrder = new TSysCancleOrder();


            cancleOrder.setCompanyId(ShiroKit.getUser().getObjectId());


            cancleOrder.setContent(result);


            tSysCancleOrderService.insert(cancleOrder);


        }




        //预约取消设置(专车)


        TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));


        if (SinataUtil.isNotEmpty(yyCancelOne)){


            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);


        }


        //预约取消设置(出租车)


        TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));


        if (SinataUtil.isNotEmpty(yyCancelTwo)){


            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);


        }


        //        JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());


//        map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));


//        //普通取消设置(专车)


//        TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));


//        if (SinataUtil.isNotEmpty(ptCancelOne)){


//            ptCancelOne.setMinuteNum(ptCancel1);


//            ptCancelOne.setMoney(ptCancel2);


//


//            ptCancelOne.setKm(Integer.valueOf(km));


//            ptCancelOne.setKmMinute(kmMinute);


//            ptCancelOne.setOvertime(overtime);


//


//            tSysCancleOrderService.updateById(ptCancelOne);


//        }else{


//            ptCancelOne = new TSysCancleOrder();


//            ptCancelOne.setMinuteNum(ptCancel1);


//            ptCancelOne.setMoney(ptCancel2);


//            ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());


//            ptCancelOne.setType(1);


//            ptCancelOne.setOrderType(1);


//            ptCancelOne.setKm(Integer.valueOf(km));


//            ptCancelOne.setKmMinute(kmMinute);


//            ptCancelOne.setOvertime(overtime);


//


//            tSysCancleOrderService.insert(ptCancelOne);


//        }


//


//        //普通取消设置(出租车)


//        TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));


//        if (SinataUtil.isNotEmpty(ptCancelTwo)){


//            ptCancelTwo.setMinuteNum(ptCancel3);


//            ptCancelTwo.setMoney(ptCancel4);


//


//            ptCancelTwo.setKm(Integer.valueOf(km));


//            ptCancelTwo.setKmMinute(kmMinute);


//            ptCancelTwo.setOvertime(overtime);


//            tSysCancleOrderService.updateById(ptCancelTwo);


//        }else{


//            ptCancelTwo = new TSysCancleOrder();


//            ptCancelTwo.setMinuteNum(ptCancel3);


//            ptCancelTwo.setMoney(ptCancel4);


//            ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());


//


//            ptCancelTwo.setKm(Integer.valueOf(km));


//            ptCancelTwo.setKmMinute(kmMinute);


//            ptCancelTwo.setOvertime(overtime);


//            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));


//        if (SinataUtil.isNotEmpty(ptCancelThree)){


//            ptCancelThree.setMinuteNum(ptCancel5);


//            ptCancelThree.setMoney(ptCancel6);


//


//            BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);


//            ptCancelThree.setKm(Integer.valueOf(km));


//            ptCancelThree.setKmMinute(kmMinute);


//            ptCancelThree.setOvertime(overtime);


//            ptCancelThree.setReserveMoney(bigDecimal1);


//            tSysCancleOrderService.updateById(ptCancelThree);


//        }else{


//            ptCancelThree = new TSysCancleOrder();


//            ptCancelThree.setMinuteNum(ptCancel5);


//            ptCancelThree.setMoney(ptCancel6);


//            ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());


//            ptCancelThree.setType(1);


//            ptCancelThree.setOrderType(3);


//


//            BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);


//            ptCancelThree.setKm(Integer.valueOf(km));


//            ptCancelThree.setKmMinute(kmMinute);


//            ptCancelThree.setOvertime(overtime);


//            ptCancelThree.setReserveMoney(bigDecimal1);


//            tSysCancleOrderService.insert(ptCancelThree);


//        }


//


//        //预约取消设置(专车)


//        TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));


//        if (SinataUtil.isNotEmpty(yyCancelOne)){


//            yyCancelOne.setMinuteNum(yyCancel1);


//            yyCancelOne.setMoney(yyCancel2);


//


//            BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);


//            yyCancelOne.setKm(Integer.valueOf(km2));


//            yyCancelOne.setKmMinute(kmMinute2);


//            yyCancelOne.setOvertime(overtime);


//            yyCancelOne.setReserveMoney(bigDecimal1);


//            tSysCancleOrderService.updateById(yyCancelOne);


//        }else{


//            yyCancelOne = new TSysCancleOrder();


//            yyCancelOne.setMinuteNum(yyCancel1);


//            yyCancelOne.setMoney(yyCancel2);


//            yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());


//            yyCancelOne.setType(2);


//            yyCancelOne.setOrderType(1);


//


//            BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);


//            yyCancelOne.setKm(Integer.valueOf(km2));


//            yyCancelOne.setKmMinute(kmMinute2);


//            yyCancelOne.setOvertime(overtime);


//            yyCancelOne.setReserveMoney(bigDecimal1);


//            tSysCancleOrderService.insert(yyCancelOne);


//        }


//        //预约取消设置(出租车)


//        TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));


//        if (SinataUtil.isNotEmpty(yyCancelTwo)){


//            yyCancelTwo.setMinuteNum(yyCancel3);


//            yyCancelTwo.setMoney(yyCancel4);


//            BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);


//            yyCancelTwo.setKm(Integer.valueOf(km2));


//            yyCancelTwo.setKmMinute(kmMinute2);


//            yyCancelTwo.setOvertime(overtime);


//            yyCancelTwo.setReserveMoney(bigDecimal1);


//            tSysCancleOrderService.updateById(yyCancelTwo);


//        }else{


//            yyCancelTwo = new TSysCancleOrder();


//            yyCancelTwo.setMinuteNum(yyCancel3);


//            yyCancelTwo.setMoney(yyCancel4);


//            yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());


//            yyCancelTwo.setType(2);


//            yyCancelTwo.setOrderType(2);


//


//            BigDecimal bigDecimal1 = new BigDecimal(reserveMoney);


//            yyCancelTwo.setKm(Integer.valueOf(km2));


//            yyCancelTwo.setKmMinute(kmMinute2);


//            yyCancelTwo.setOvertime(overtime);


//            yyCancelTwo.setReserveMoney(bigDecimal1);


//            tSysCancleOrderService.insert(yyCancelTwo);


//        }




        //报警电话


        TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));


@@ -466,6 +776,23 @@


            driverAssessment.setInsertTime(new Date());


            driverAssessmentService.insert(driverAssessment);


        }


        // 超时设置


        TSysOverTime overTime = sysOverTimeService.selectOne(new EntityWrapper<TSysOverTime>().eq("companyId", ShiroKit.getUser().getObjectId()));


        if (overTime!=null){


            overTime.setCar(overtime1);


            overTime.setPackageTime(packageTime);


            overTime.setReserveTime(reserveTime);


            overTime.setReserveNext(reserveNext);


            sysOverTimeService.updateById(overTime);


        }else{


            TSysOverTime tSysOverTime = new TSysOverTime();


            tSysOverTime.setCompanyId(ShiroKit.getUser().getObjectId());


            tSysOverTime.setCar(overtime1);


            tSysOverTime.setPackageTime(packageTime);


            tSysOverTime.setReserveTime(reserveTime);


            tSysOverTime.setReserveNext(reserveNext);


            sysOverTimeService.insert(tSysOverTime);


        }


        return SUCCESS_TIP;


    }