承运新增字段同步到网络货运大后台

performance-api/src/main/java/com/clx/performance/vo/pc/broker/OpenOrderChildDTO.java

@@ -21,6 +21,8 @@ public class OpenOrderChildDTO {
     private String sourceOrderNo;
     @ApiModelProperty(value = "源结算单编号", example = "1234", required = true, dataType = "String")
     private String sourceSettlementNo;
+    @ApiModelProperty(value = "订单来源", example = "1234", required = true, dataType = "String")
+    private Integer orderSource;
 
     @ApiModelProperty(value = "运费单价（分/吨）", example = "162", required = true, dataType = "Integer")
     private Integer freightPrice;
@@ -36,6 +38,8 @@ public class OpenOrderChildDTO {
     private Integer lossFee;
     @ApiModelProperty(value = "货损单价（分/吨）",  example = "123", dataType = "Integer")
     private Integer lossFeePrice;
+    @ApiModelProperty(value = "管理费（分）",  example = "123", dataType = "Integer")
+    private Integer invoiceServiceFee;
 
     @ApiModelProperty(value = "发货皮重（吨）")
     private BigDecimal sendTare;
@@ -61,6 +65,8 @@ public class OpenOrderChildDTO {
     private BigDecimal receiveRough;
     @ApiModelProperty(value = "收货净重（吨）")
     private BigDecimal receiveNet;
+    @ApiModelProperty(value = "实收净重（吨）")
+    private BigDecimal realNet;
 
     @ApiModelProperty(value = "备注", example = "", required = true, dataType = "String")
     private String remark;

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

@@ -252,6 +252,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setSourceGoodsNo(orderChild.getOrderGoodsNo());
         orderChildInfo.setSourceOrderNo(orderChild.getOrderNo());
         orderChildInfo.setSourceSettlementNo(settlementOwnerDetail.getSettlementNo());
+        orderChildInfo.setOrderSource(orderChild.getOrderSource());
 
         orderChildInfo.setFreight(orderChild.getFreightPrice()
                 .multiply(orderChild.getUnloadNet().min(orderChild.getLoadNet()))
@@ -279,6 +280,10 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setReceiveTare(orderChild.getUnloadTare());
         orderChildInfo.setReceiveRough(orderChild.getUnloadRough());
         orderChildInfo.setReceiveNet(orderChild.getUnloadNet());
+
+        orderChildInfo.setRealNet(settlementOwnerDetail.getWeight());
+        orderChildInfo.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee().intValue());
+
         orderChildInfo.setInvoiceFlag(settlementOwnerDetail.getInvoiceType()==null? null
                 :Objects.equals(settlementOwnerDetail.getInvoiceType(),
                 SettlementOwnerEnum.InvoiceType.ONLINE.getCode())? 2 : 1);