提交 0142157c authored 作者: 刘海泉's avatar 刘海泉

增加承运运单详情增加取消和接单时间字段

上级 07df4adf
package com.clx.performance.controller.pc.owner; package com.clx.performance.controller.pc.owner;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.enums.OwnerAccountEnum;
import com.clx.performance.model.OwnerTransferInfo; import com.clx.performance.model.OwnerTransferInfo;
import com.clx.performance.param.pc.*; import com.clx.performance.param.pc.*;
import com.clx.performance.param.pc.owner.CreteAccountParam; import com.clx.performance.param.pc.owner.CreteAccountParam;
import com.clx.performance.param.pc.owner.FrozenAccountParam;
import com.clx.performance.service.*; import com.clx.performance.service.*;
import com.clx.performance.vo.pc.*; import com.clx.performance.vo.pc.*;
import com.clx.user.feign.OwnerInfoFeign;
import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
import com.clx.user.vo.pc.owner.OwnerBindCardVO; import com.clx.user.vo.pc.owner.OwnerBindCardVO;
import com.msl.common.base.PageData; import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert; import com.msl.common.convertor.aspect.UnitCovert;
...@@ -20,7 +16,6 @@ import io.swagger.annotations.Api; ...@@ -20,7 +16,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -29,10 +24,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -29,10 +24,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j @Slf4j
@RestController @RestController
...@@ -102,7 +93,7 @@ public class OwnerAccountController { ...@@ -102,7 +93,7 @@ public class OwnerAccountController {
@ApiOperation(value = "货主付款确认", notes = "<br>By:胡宇帆") @ApiOperation(value = "货主付款确认", notes = "<br>By:胡宇帆")
@GetMapping("/accountBalanceConfirm") @GetMapping("/accountBalanceConfirm")
public Result<Object> accountBalanceConfirm(@RequestParam @NotNull(message = "编号不能为空") Integer id) { public Result<Object> accountBalanceConfirm(@RequestParam(required = false) @NotNull(message = "编号不能为空") Integer id) {
ownerAccountService.accountBalanceConfirm(id); ownerAccountService.accountBalanceConfirm(id);
return Result.ok(); return Result.ok();
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论