最新版本

wang-hao-jie

2022-03-17 6dfd2599d2e52507e018fd4c6b35d38873e48cfb

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java

@@ -64,6 +64,9 @@
    @Autowired
    private DepartmentService departmentService;

    @Autowired
    private IEventLogService iEventLogService;

    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<OrderTask> get(@PathVariable String id) {
@@ -72,33 +75,62 @@
        return new ResultUtil<OrderTask>().setData(orderTask);
    }

    public Area getArea(String userId){
        QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
        wrapper.eq("user_id",userId);
        Area area = iAreaService.getOne(wrapper);
        if(area==null){
            QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
            carQueryWrapper.eq("user_id",userId);
            Car one = iCarService.getOne(carQueryWrapper);
//    public Area getArea(String userId){
//        QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
//        wrapper.eq("user_id",userId);
//        Area area = iAreaService.getOne(wrapper);
//        if(area==null){
//            QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
//            carQueryWrapper.eq("user_id",userId);
//            Car one = iCarService.getOne(carQueryWrapper);
//            if(one==null){
//                return null;
//            }
//            if(StrUtil.isEmpty(one.getFollowUserId())){
//                return null;
//            }
//
//            QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
//            wrapper3.eq("user_id",one.getFollowUserId());
//            area = iAreaService.getOne(wrapper3);
//            return area;
//        }
//        return area;
//    }

            QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
            wrapper3.eq("user_id",one.getFollowUserId());
            area = iAreaService.getOne(wrapper3);

    private String getFormatDate(String sendTime){
        if(StrUtil.isNotEmpty(sendTime)){
            return sendTime;
        }else{
            return DateUtil.format(new Date(), "yyyy-MM-dd");
        }
    }

    public Area getArea(String userId){
        QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
        carQueryWrapper.eq("user_id",userId).or().eq("follow_user_id",userId);
        Car one = iCarService.getOne(carQueryWrapper);
        if(one==null){
            return null;
        }else{
            QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
            wrapper.eq("car_id",one.getId());
            Area area = iAreaService.getOne(wrapper);
            return area;
        }
        return area;
    }

    @RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
    @ApiOperation(value = "获取今日任务统计信息")
    public Result<Object> getAll() {
    public Result<Object> getAll(String sendTime) {
        Area area = getArea(securityUtil.getCurrUser().getId());
        if(area==null){
            return ResultUtil.error("请联系管理员绑定片区配送员");
            return ResultUtil.error("请联系管理员绑定该车辆");
        }

        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        String format = getFormatDate(sendTime);
        wrapper2.eq("area_id",area.getId());
        wrapper2.eq("send_date",format);
        List<OrderTask> list = iOrderTaskService.list(wrapper2);
@@ -117,37 +149,29 @@
            map.put("name",area2.getName()+a.getName());
            list.clear();
        }
        map.put("lng","");
        map.put("lat","");
        List<String> deparmentIds = securityUtil.getDeparmentIds();
        if(deparmentIds.size()>0){
            Department department = departmentService.get(deparmentIds.get(0));
            map.put("lng",department.getLng());
            map.put("lat",department.getLat());
        }
        return new ResultUtil<Object>().setData(map);
    }

    @RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
    @ApiOperation(value = "获取今日任务详情")
    public Result<List<OrderTask>> getTodayOrder() {
    @ApiOperation(value = "获取今日配送任务详情列表")
    public Result<List<OrderTask>> getTodayOrder(String sendTime) {
        Area area = getArea(securityUtil.getCurrUser().getId());
        if(area==null){
            return ResultUtil.error("请联系管理员绑定片区配送员");
            return ResultUtil.error("请联系管理员绑定该车辆");
        }

        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        String format = getFormatDate(sendTime);
        wrapper2.eq("a.area_id",area.getId());
        wrapper2.eq("a.send_date",format);
        wrapper2.orderByAsc("a.seq");
        wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
        List<OrderTask> list = iOrderTaskService.list2(wrapper2);
        return new ResultUtil<List<OrderTask>>().setData(list);
    }

    @RequestMapping(value = "/getTodayOrderDetail", method = RequestMethod.GET)
    @ApiOperation(value = "获取当前配送商户详情")
    public Result<OrderTask> getTodayOrderDetail(String orderId) {
    public Result<OrderTask> getTodayOrderDetail(String orderId,String sendTime) {
        OrderTask orderTask = new OrderTask();
        if(!StrUtil.isEmpty(orderId)){
            orderTask = iOrderTaskService.getById(orderId);
@@ -157,11 +181,11 @@
        }else{
            Area area = getArea(securityUtil.getCurrUser().getId());
            if(area==null){
                return ResultUtil.error("请联系管理员绑定片区配送员");
                return ResultUtil.error("请联系管理员绑定该车辆");
            }

            QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
            String format = DateUtil.format(new Date(), "yyyy-MM-dd");
            String format = getFormatDate(sendTime);
            wrapper2.eq("area_id",area.getId());
            wrapper2.eq("send_date",format);
            wrapper2.eq("status",0);
@@ -184,15 +208,15 @@

    @RequestMapping(value = "/getTodayOtherInfo", method = RequestMethod.GET)
    @ApiOperation(value = "获取其它信息")
    public Result<Object> getTodayOtherInfo() {
    public Result<Object> getTodayOtherInfo(String sendTime) {

        Area area = getArea(securityUtil.getCurrUser().getId());
        if(area==null){
            return ResultUtil.error("请联系管理员绑定片区配送员");
            return ResultUtil.error("请联系管理员绑定该车辆");
        }

        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        String format = getFormatDate(sendTime);
        wrapper2.eq("area_id",area.getId());
        wrapper2.eq("send_date",format);
        wrapper2.ne("status",0);
@@ -234,6 +258,15 @@
            }
        }
        map.put("content",content);

        map.put("lng","");
        map.put("lat","");
        String deptId = securityUtil.getCurrUser().getDepartmentId();
        if(StrUtil.isNotEmpty(deptId)){
            Department department = departmentService.get(deptId);
            map.put("lng",department.getLng());
            map.put("lat",department.getLat());
        }
        return new ResultUtil<Object>().setData(map);
    }

@@ -248,15 +281,21 @@

    @RequestMapping(value = "/signFor", method = RequestMethod.POST)
    @ApiOperation(value = "签收")
    public Object signFor(String orderId,int status,String content,String customerReceiveId) {
    public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) {
        if(status==1){
            if(StrUtil.isEmpty(customerReceiveId)){
                return ResultUtil.error("正常签收，接货人id必填");
            }
        }

        if(StrUtil.isEmpty(carId)){
            return ResultUtil.error("车辆id不能为空");
        }
        OrderTask orderTask = iOrderTaskService.getById(orderId);
        orderTask.setStatus(status);
        orderTask.setUserId(securityUtil.getCurrUser().getId());
        orderTask.setTime(time);
        orderTask.setCarId(carId);
        if(StrUtil.isNotEmpty(customerReceiveId)){
            orderTask.setCustomerReceiveId(customerReceiveId);
        }
@@ -269,14 +308,36 @@
            }
        }
        iOrderTaskService.saveOrUpdate(orderTask);

        Car car = iCarService.getById(orderTask.getCarId());
        EventLog eventLog = new EventLog();
        eventLog.setCarNo(car.getCarNo());
        eventLog.setRefId(orderId);
        eventLog.setType(6);//6:配送完成
        iEventLogService.saveOrUpdate(eventLog);
        return ResultUtil.success("添加成功");
    }

    @RequestMapping(value = "/getTaKan", method = RequestMethod.GET)
    @ApiOperation(value = "获取踏勘商户")
    public Result<List<Customer>> getTaKan() {
        Area area = getArea(securityUtil.getCurrUser().getId());
        if(area==null){
            return ResultUtil.error("请联系管理员绑定该车辆");
        }

        QueryWrapper<Customer> wrapper2 = new QueryWrapper<Customer>();
        wrapper2.eq("area_id",area.getId());
        wrapper2.eq("kstatus",0);
        List<Customer> list = iCustomerService.list(wrapper2);
        return new ResultUtil<List<Customer>>().setData(list);
    }

    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    public Result<IPage<OrderTask>> getByPage(PageVo page) {

        IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page));
        IPage<OrderTask> data = iOrderTaskService.page2(PageUtil.initMpPage(page));
        return new ResultUtil<IPage<OrderTask>>().setData(data);
    }