bug
zhangzeli
2022-02-09 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -252,15 +252,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);
        }
@@ -287,7 +293,7 @@
    @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);
    }