结算单相关

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

@@ -43,6 +43,7 @@ public class SettlementDriverDetail implements HasKey<Integer> {
     private BigDecimal lossWeight;                  //货损吨数
     private BigDecimal lossFreight;                 //货损金额（分）
     private BigDecimal prepayFreight;               //预付运费金额（分）
+    private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付
     private BigDecimal settlementFreight;           //结算金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private Integer status;                         //状态

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

@@ -42,9 +42,16 @@ public class SettlementServiceImpl implements SettlementService {
 
         if (settlementOwnerDetail.getInvoiceType() != null) {return;}
 
-        // 结算金额<0走普通单
-        if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) < 0){
+        // 货主结算金额<0走普通单
+        if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) < 0){
             invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+            settlementDriverDetail.setPrepayFreightFlag(0);
+        } else {
+            //是否通过风控,调用网络货运
+            //设置预付运费标示
+            if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+                settlementDriverDetail.setPrepayFreightFlag(1);
+            }
         }
 
         settlementOwnerDetail.setInvoiceType(invoiceType);