Merge remote-tracking branch 'origin/test' into test

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

@@ -50,8 +50,8 @@ public enum SettlementOrderChildRiskEnum {
     @Getter
     @AllArgsConstructor
     public enum Status {
-        INIT(0, "待处理"),
-        PROCESSED(1, "已处理");
+        INIT(1, "待处理"),
+        PROCESSED(2, "已处理");
         private final Integer code;
         private final String msg;
 

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;
+
+    @ApiModelProperty(value = "结算凭证")
+    private String invoiceImg;
+
     @MoneyOutConvert
     @ApiModelProperty(value = "开票服务费")
     private BigDecimal invoiceServiceFee;

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

@@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -245,7 +246,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setSourceOrderNo(orderChild.getOrderNo());
         orderChildInfo.setSourceSettlementNo(settlementOwnerDetail.getSettlementNo());
 
-        orderChildInfo.setFreight(orderChild.getFreight().intValue());
+        orderChildInfo.setFreight(orderChild.getFreightPrice().multiply(orderChild.getUnloadNet())
+                .setScale(0, RoundingMode.HALF_UP).intValue());
         orderChildInfo.setDriverFreight(orderChild.getFreight().intValue());
         orderChildInfo.setDriverFreightPrice(orderChild.getFreightPrice().intValue());
 

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

@@ -140,10 +140,11 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             rowData.add(new ExcelData(vo.getDriverMobile()));
 
             rowData.add(new ExcelData(vo.getGoodsName()));
-            rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(vo.getInvoiceType())));
-            rowData.add(new ExcelData(SettlementOrderChildRiskEnum.RiskType.getMsgByCode(vo.getRiskType())));
-            rowData.add(new ExcelData(SettlementOrderChildRiskEnum.Status.getMsgByCode(vo.getStatus())));
-            rowData.add(new ExcelData(SettlementOrderChildRiskEnum.ProcessMethod.getMsgByCode(vo.getProcessMethod())));
+            rowData.add(new ExcelData(vo.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(vo.getInvoiceType())));
+            rowData.add(new ExcelData(vo.getRiskType()==null?null:SettlementOrderChildRiskEnum.RiskType.getMsgByCode(vo.getRiskType())));
+            rowData.add(new ExcelData(vo.getRiskRemark()));
+            rowData.add(new ExcelData(vo.getStatus()==null?null:SettlementOrderChildRiskEnum.Status.getMsgByCode(vo.getStatus())));
+            rowData.add(new ExcelData(vo.getProcessMethod()==null?null:SettlementOrderChildRiskEnum.ProcessMethod.getMsgByCode(vo.getProcessMethod())));
             rowData.add(new ExcelData(vo.getPoundAuditTime()));
             rowData.add(new ExcelData(vo.getCreateTime()));
             rowData.add(new ExcelData(vo.getProcessBy()));