Merge remote-tracking branch 'origin/v17.5_order_child_sync_broker_20240617'…

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementWayEnum.java

@@ -13,7 +13,9 @@ public enum SettlementWayEnum {
     @AllArgsConstructor
     public enum WayType {
         LOAD(1, "装车净重"),
-        UNLOAD(2, "卸车净重");
+        UNLOAD(2, "卸车净重"),
+        UNLOAD_LOSS(3, "卸车净重（减货损）"),
+        ;
         private final Integer code;
         private final String msg;
 

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementOwnerParam.java

@@ -28,10 +28,16 @@ public class PageCarrierSettlementOwnerParam extends PageParam {
     @ApiModelProperty(value="货主姓名",example = "张三")
     private String ownerUserName;
 
-    @ApiModelProperty("结算方式  1装车净重 2卸车净重")
+    @ApiModelProperty("结算方式  1装车净重 2卸车净重 3卸车净重（减货损）")
     private Integer settlementWay;
 
 
     @ApiModelProperty("订单编号")
     private String orderNo;
+
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -66,6 +66,16 @@ public class CarrierPageSettlementDriverVO {
     @ApiModelProperty(value = "借款标示  0：未借款 1：已借款 2:已还款")
     private String loanFlagMsg;
 
+    @ApiModelProperty(value = "开票公司id")
+    private Integer invoicingCompanyId;
+    @ApiModelProperty(value = "开票公司简称")
+    private Integer invoicingCompanyShorterName;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票服务费")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value = "开票服务率%")
+    private BigDecimal invoiceServiceFeeRate;
+
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -51,6 +51,10 @@ public class CarrierPageSettlementOwnerVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票服务费")
+    private BigDecimal invoiceServiceFee;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
     @ApiModelProperty(value = "状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -80,13 +80,19 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="开票标识：1网运单 2普通单",example = "普通单")
     private String invoiceTypeMsg;
 
+    @MoneyOutConvert
+    @ApiModelProperty(value="开票服务费",example = "2.1")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value="开票费率%",example = "12.34")
+    private BigDecimal invoiceServiceFeeRate;
+
     @ApiModelProperty(value="尾款状态 0-否,1-是,2-无需支付",example = "无需支付")
     private String finalPaymentStatusMsg;
 
     @ApiModelProperty(value="开票状态 0-否,1-是",example = "是")
     private String invoiceStatusMsg;
 
-    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重",example = "1")
+    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损",example = "1")
     private Integer settlementWay;
 
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -118,6 +118,13 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         if(StringUtils.isNotBlank(param.getOrderNo())){
             query.eq(SettlementOwner :: getOrderNo,param.getOrderNo());
         }
+        if(StringUtils.isNotBlank(param.getBeginTime())){
+            query.ge(SettlementOwner :: getCreateTime,param.getBeginTime());
+        }
+        if(StringUtils.isNotBlank(param.getEndTime())){
+            query.le(SettlementOwner :: getCreateTime,param.getEndTime());
+        }
+
         query.orderByDesc(SettlementOwner :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
 

performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriver.java

@@ -48,6 +48,10 @@ public class SettlementDriver implements HasKey<Integer> {
     private String settlementPlatform;              //结算平台
     private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付
     private String payErrorMsg;              //支付失败原因
+    private Integer invoicingCompanyId;             //开票公司id
+    private Integer invoicingCompanyShorterName;    //开票公司简称
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
+    private BigDecimal invoiceServiceFeeRate;       //开票服务率%
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -29,10 +29,10 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer id;                             //id
     private Long ownerUserNo;                       //货主用户编号
     private String ownerName;                       //货主名称
-    private Integer settlementWay;                  //结算方式  1装车净重 2卸车净重
+    private Integer settlementWay;                  //结算方式  1装车净重 2卸车净重 3卸车净重（减货损）
     private String settlementNo;                    //结算单编号
     private String settlementSubNo;                 //结算子单号
-    private Integer settlementPeriodType;           //结算周期类型：1拉运完成结 2月结
+    private Integer settlementPeriodType;           //结算周期类型：1拉运完成结 2月结 3日结
     private LocalDateTime settlementPeriodTime;     //结算周期时间（月结）
     private String orderNo;                         //订单编号
     private BigDecimal weight;                      //实际净重（吨）
@@ -45,6 +45,7 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private BigDecimal invoiceFreight;              //开票金额（分）
     private String invoiceImg;                      //结算凭证
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
     private String payee;                           //收款人
     private String payeeBankName;                   //收款银行
     private String payeeBankCardNo;                //收款银行卡卡号

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -52,6 +52,8 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private BigDecimal loanFreight;                 //借款抵扣金额（分）
     private BigDecimal invoiceFreight;              //开票金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
+    private BigDecimal invoiceServiceFeeRate;       //开票服务率
     private Integer finalPaymentStatus;             //尾款状态 0-否,1-是,2-无需支付
     private Integer invoiceStatus;                  //开票状态 0-否,1-是,2-无需开票
     private Integer invoicingCompanyId;  //开票公司id

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

@@ -202,18 +202,20 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(8, "货损吨数", "lossWeight", 5000));
         fieldList.add(new ExcelField(9, "货损单价", "lossPrice", 5000));
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
-
-        fieldList.add(new ExcelField(14, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(15, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(16, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(17, "结算单号", "settlementNo", 15000));
-        fieldList.add(new ExcelField(18, "结算子单号", "settlementSubNo", 15000));
-        fieldList.add(new ExcelField(19, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(20, "是否已付尾款", "finalPaymentStatus", 5000));
-        fieldList.add(new ExcelField(21, "是否已开票", "invoiceStatus", 5000));
+        fieldList.add(new ExcelField(11, "开票费率", "invoiceServiceFeeRate", 5000));
+        fieldList.add(new ExcelField(12, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(13, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(14, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(15, "借款抵扣金额", "loanFreight", 5000));
+
+        fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(17, "开票标识", "invoiceType", 5000));
+        fieldList.add(new ExcelField(18, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(19, "结算单号", "settlementNo", 15000));
+        fieldList.add(new ExcelField(20, "结算子单号", "settlementSubNo", 15000));
+        fieldList.add(new ExcelField(21, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(22, "是否已付尾款", "finalPaymentStatus", 5000));
+        fieldList.add(new ExcelField(23, "是否已开票", "invoiceStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -235,9 +237,12 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2)));
+
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(dto.getOrderNo()));

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

@@ -427,10 +427,11 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         fieldList.add(new ExcelField(8, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(9, "货损吨数", "lossWeight", 5000));
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(12, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(13, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(14, "状态", "status", 5000));
+        fieldList.add(new ExcelField(11, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(13, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(14, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(15, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -450,6 +451,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getCreateTime()));