货主结算单详情

performance-api/src/main/java/com/clx/settlement/vo/pc/CarrierSettlementOwnerDetailVO.java

+package com.clx.settlement.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@ApiModel(description = "货主结算单")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierSettlementOwnerDetailVO {
+
+    @ApiModelProperty(value = "id", example = "1.23")
+    private Integer id;
+
+    @ApiModelProperty(value = "货主用户编号", example = "123")
+    private Long ownerUserNo;
+
+    @ApiModelProperty(value = "货主名称", example = "货主")
+    private String ownerName;
+
+    @ApiModelProperty(value = "结算单编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "结算子单号", example = "JS012")
+    private String settlementSubNo;
+
+    @ApiModelProperty(value = "运单编号", example = "123")
+    private String childNo;
+
+    @ApiModelProperty(value = "实际净重（吨）", example = "1.23")
+    private BigDecimal weight;
+
+    @ApiModelProperty(value = "实际运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal freight;
+
+    @ApiModelProperty(value = "货损吨数（吨）", example = "1.23")
+    private BigDecimal lossWeight;
+
+    @ApiModelProperty(value = "货损金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossFreight;
+
+    @ApiModelProperty(value = "预付运费金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal prepayFreight;
+
+    @ApiModelProperty(value = "结算金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal settlementFreight;
+
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
+    private Integer invoiceType;
+
+    @ApiModelProperty(value = "开票金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal invoiceFreight;
+
+    @ApiModelProperty(value = "结算凭证", example = "/a.png")
+    private String invoiceImg;
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+    @ApiModelProperty(value = "公司名称", example = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "企业税号", example = "企业税号")
+    private String companyTaxCode;
+
+    @ApiModelProperty(value = "公司地址", example = "公司地址")
+    private String companyAddress;
+
+    @ApiModelProperty(value = "公司电话", example = "1222222222")
+    private String companyMobile;
+
+    @ApiModelProperty(value = "公司开户行", example = "中国银行")
+    private String companyBankName;
+
+    @ApiModelProperty(value = "公司银行账号", example = "6215454545")
+    private String companyBankNo;
+
+    @ApiModelProperty(value = "公司联系人", example = "1.23")
+    private String companyContact;
+
+    @ApiModelProperty(value = "公司联系电话", example = "公司联系人")
+    private String companyContactMobile;
+
+    @ApiModelProperty(value = "公司联系地址", example = "公司联系地址")
+    private String companyContactAddress;
+
+    @ApiModelProperty(value = "快递公司", example = "顺风")
+    private String expressCompany;
+
+    @ApiModelProperty(value = "快递编号", example = "SF145787")
+    private String expressNo;
+
+    @ApiModelProperty(value = "开票状态", example = "1")
+    private Integer invoiceStatus;
+
+    @ApiModelProperty(value = "状态", example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value = "合并结算单时间", example = "2023-01-01 00:00:00")
+    private String mergeTime;
+
+
+}
\ No newline at end of file

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

+package com.clx.performance.controller.pc.carrier;
+
+import com.clx.performance.service.SettlementOwnerService;
+import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotNull;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlementOwner")
+@Validated
+@Api(tags = "承运端-货主结算")
+@AllArgsConstructor
+public class CarrierSettlementOwnerController {
+
+    private final SettlementOwnerService settlementOwnerService;
+
+
+    @ApiOperation(value = "结算单详情",notes = "<br>By:李瑞新")
+    @GetMapping("/getCarrierSettlementOwnerDetail")
+    @UnitCovert(param = false)
+    public Result<CarrierSettlementOwnerDetailVO> getCarrierSettlementOwnerDetail(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id));
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/model/SettlementOwner.java

@@ -43,7 +43,7 @@ public class SettlementOwner implements HasKey<Integer> {
     private String invoiceImg;                      //结算凭证
     private String payee;                           //收款人
     private String payeeBankName;                   //收款银行
-    private Integer payeeBankCardNo;                //收款银行卡卡号
+    private String payeeBankCardNo;                //收款银行卡卡号
     private String companyName;                     //公司名称
     private String companyTaxCode;                  //企业税号
     private String companyAddress;                  //公司地址

performance-web/src/main/java/com/clx/performance/service/SettlementOwnerService.java

 package com.clx.performance.service;
 
 
+import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
 
 /**
  * @author liruixin
@@ -8,4 +9,6 @@ package com.clx.performance.service;
  * Time 09:43
  */
 public interface SettlementOwnerService {
+
+    CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id);
 }

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

 package com.clx.performance.service.impl;
 
+import com.clx.performance.dao.SettlementOwnerDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.SettlementOwner;
 import com.clx.performance.service.SettlementOwnerService;
+import com.clx.performance.struct.SettlementOwnerStruct;
+import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
@@ -8,6 +15,19 @@ import org.springframework.stereotype.Service;
  * Date 2023-10-12
  * Time 09:43
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
+
+    private final SettlementOwnerDao settlementOwnerDao;
+
+    private final SettlementOwnerStruct settlementOwnerStruct;
+
+
+    @Override
+    public CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id) {
+        SettlementOwner settlementOwner =settlementOwnerDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        return settlementOwnerStruct.convert(settlementOwner);
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/SettlementOwnerStruct.java

+package com.clx.performance.struct;
+
+import com.clx.performance.model.SettlementOwner;
+import com.clx.settlement.vo.pc.CarrierSettlementOwnerDetailVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface SettlementOwnerStruct {
+
+
+    CarrierSettlementOwnerDetailVO convert(SettlementOwner settlementOwner);
+
+}