修改bug

Pu Zhibing

2024-12-12 822ed15aacf175cba141c3a423e17f044d569768

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

@@ -253,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()));