修改文档bug

Pu Zhibing

2025-05-16 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc

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

@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 系统设置控制器
@@ -120,7 +121,8 @@
    @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);
@@ -129,7 +131,16 @@
            for (Map<String, Object> stringObjectMap : list) {
                stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");
            }
            page.setRecords(list);
            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);
    }
@@ -172,7 +183,7 @@
        String s = replace + ":00";
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Date date = dateFormat.parse(s);
        tSysRedSet.setInsertTime(date);
        tSysRedSet.setEffectiveDate(date);
        tSysRedSet.setUpdateTime(new Date());
        redEnvelopePaymentSettingsService.updateById(tSysRedSet);
        return SUCCESS_TIP;
@@ -242,39 +253,62 @@
        model.addAttribute("ptCancel3",ptCancel3);

        // 司机超时
        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);
        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()));
@@ -315,11 +349,11 @@
                        @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 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,
@@ -439,70 +473,70 @@
        }

        //出租车推单(第一轮)
        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);
        }
//        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格式存储
@@ -535,8 +569,15 @@
        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);
        cancleOrder.setContent(result);
        tSysCancleOrderService.updateById(cancleOrder);
        if(null != cancleOrder){
            cancleOrder.setContent(result);
            tSysCancleOrderService.updateById(cancleOrder);
        }else{
            cancleOrder = new TSysCancleOrder();
            cancleOrder.setCompanyId(ShiroKit.getUser().getObjectId());
            cancleOrder.setContent(result);
            tSysCancleOrderService.insert(cancleOrder);
        }
        //        JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
//        map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
//        //普通取消设置(专车)