Pu Zhibing
2025-04-22 279d3bbbe15d4839cba8dfb48053c75b504aacc3
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -84,6 +84,17 @@
    }
    /**
     * 跳转到专车订单首页
     */
    @RequestMapping("/abnormalOrder")
    public String abnormalOrder(Model model) {
        //服务专车车型
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        model.addAttribute("carmodelList",carmodelList);
        return PREFIX + "tAbnormalOrder.html";
    }
    /**
     * 跳转到修改专车订单
     */
    @RequestMapping("/tOrderPrivateCar_orderDetail/{tOrderPrivateCarId}")
@@ -135,6 +146,34 @@
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
        return super.packForBT(page);
    }
    /**
     * 获取专车订单列表
     */
    @RequestMapping(value = "/abnormalList")
    @ResponseBody
    public Object abnormalList(String insertTime,
                       String orderNum,
                       Integer orderSource,
                       String userName,
                       String userPhone,
                       String passengers,
                       String passengersPhone,
                       Integer serverCarModelId,
                       String driver,
                       Integer state,
                       Integer smsNumber) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderPrivateCarService.getAbnormalOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
        return super.packForBT(page);
    }
@@ -255,7 +294,7 @@
        if(orderPrivateCar.getIsplatPay()==2){
            return "error";
        }
    //添加已收入明细
        //添加已收入明细
        TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
        Double taxi = company.getSpeMoney().doubleValue();
        BigDecimal d = null;//企业收入