结算单号查询详情

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/CarrierBreakContractSettlementDriverDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierBreakContractSettlementDriverDetailVO {
+
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3车主")
+    private Integer breakContractPartyType;
+
+    @ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
+    private String breakContractPartyTypeMsg;
+
+    @ApiModelProperty("结算单编号")
+    private String settlementNo;
+
+    @ApiModelProperty("车主用户编号")
+    private Long truckOwnUserNo;
+
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
+    @ApiModelProperty("司机名称")
+    private String driverName;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @MoneyOutConvert
+    @ApiModelProperty("违约金（分）")
+    private BigDecimal figure;
+
+    @ApiModelProperty("违约说明")
+    private String breakContractRemark;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private String settleStatusMsg;
+
+    @ApiModelProperty("结算状态 1待结算;2已结算")
+    private Integer settleStatus;
+
+    @ApiModelProperty("结算平台 0马上来")
+    private String settlePlatformMsg;
+
+    @ApiModelProperty("结算平台 0马上来")
+    private Integer settlePlatform;
+
+    @ApiModelProperty("结算时间")
+    private String settleTime;
+
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementDriverController.java

@@ -3,6 +3,7 @@ package com.clx.performance.controller.pc.breakcontract.carrier;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
 import com.clx.performance.service.breakcontract.BreakContractSettlementDriverService;
+import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementDriverDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
@@ -15,12 +16,10 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 
 
 @Slf4j
@@ -52,4 +51,11 @@ public class CarrierBreakContractSettlementDriverController {
         return null;
     }
 
+    @ApiOperation(value = "详情",notes = "<br>By:李瑞新")
+    @GetMapping("/getCarrierBreakContractSettlementDriverDetail")
+    @UnitCovert(param = false)
+    public Result<CarrierBreakContractSettlementDriverDetailVO> getCarrierBreakContractSettlementDriverDetail(@NotBlank(message = "结算单号不能为空") String settlementNo) {
+        return Result.ok(breakContractSettlementDriverService.getDetailBySettlementNo(settlementNo));
+    }
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementOwnerController.java

@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 
@@ -56,7 +57,7 @@ public class CarrierBreakContractSettlementOwnerController {
     @ApiOperation(value = "详情",notes = "<br>By:李瑞新")
     @GetMapping("/getCarrierBreakContractSettlementOwnerDetail")
     @UnitCovert(param = false)
-    public Result<CarrierBreakContractSettlementOwnerDetailVO> getCarrierBreakContractSettlementOwnerDetail(@NotNull(message = "结算单号不能为空") String settlementNo) {
+    public Result<CarrierBreakContractSettlementOwnerDetailVO> getCarrierBreakContractSettlementOwnerDetail(@NotBlank(message = "结算单号不能为空") String settlementNo) {
         return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(settlementNo));
     }
 

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java

@@ -24,7 +24,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 
 
 @Slf4j
@@ -40,7 +40,7 @@ public class OwnerBreakContractSettlementOwnerController {
     @ApiOperation(value = "详情",notes = "<br>By:李瑞新")
     @GetMapping("/getOwnerBreakContractSettlementOwnerDetail")
     @UnitCovert(param = false)
-    public Result<CarrierBreakContractSettlementOwnerDetailVO> getOwnerBreakContractSettlementOwnerDetail(@NotNull(message = "结算单号不能为空") String settlementNo) {
+    public Result<CarrierBreakContractSettlementOwnerDetailVO> getOwnerBreakContractSettlementOwnerDetail(@NotBlank(message = "结算单号不能为空") String settlementNo) {
         return Result.ok(breakContractSettlementOwnerService.getCarrierBreakContractSettlementOwnerDetail(settlementNo));
     }
 

performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractSettlementDriverService.java

@@ -2,6 +2,7 @@ package com.clx.performance.service.breakcontract;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
+import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementDriverDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
@@ -16,4 +17,6 @@ public interface BreakContractSettlementDriverService  {
 
 
     SXSSFWorkbook exportCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param);
+
+    CarrierBreakContractSettlementDriverDetailVO getDetailBySettlementNo(String  settlementNo);
 }

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverServiceImpl.java

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.breakcontract;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
 import com.clx.performance.service.breakcontract.BreakContractSettlementDriverService;
@@ -11,6 +12,7 @@ import com.clx.performance.utils.excel.ExcelData;
 import com.clx.performance.utils.excel.ExcelField;
 import com.clx.performance.utils.excel.ExcelSheet;
 import com.clx.performance.utils.excel.ExcelUtil;
+import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementDriverDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -94,4 +96,12 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
         //创建excel
         return ExcelUtil.create(excelSheet);
     }
+
+
+    @Override
+    public CarrierBreakContractSettlementDriverDetailVO getDetailBySettlementNo(String settlementNo) {
+        BreakContractSettlementDriver settlement = breakContractSettlementDriverDao.selectBySettlementNo(settlementNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        CarrierBreakContractSettlementDriverDetailVO vo = breakContractSettlementStruct.convertDetail(settlement);
+        return vo;
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverStruct.java

@@ -3,6 +3,7 @@ package com.clx.performance.struct.breakcontract;
 import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriverDetail;
+import com.clx.performance.vo.pc.breakcontract.carrier.CarrierBreakContractSettlementDriverDetailVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
@@ -28,4 +29,9 @@ public interface BreakContractSettlementDriverStruct {
 
     BreakContractSettlementDriver convert(BreakContractSettlementDriverDetail detail);
 
+    @Mapping(target = "settleStatusMsg", expression = "java(BreakContractSettlementDriverEnum.SettleStatus.getMsgByCode(detail.getSettleStatus()))")
+    @Mapping(target = "settlePlatformMsg", expression = "java(BreakContractSettlementDriverEnum.SettlePlatform.getMsgByCode(detail.getSettlePlatform()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    CarrierBreakContractSettlementDriverDetailVO convertDetail(BreakContractSettlementDriver detail);
+
 }