Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildDriverInfoDTO.java

@@ -97,7 +97,7 @@ public class OrderChildDriverInfoDTO {
     @NotBlank(message = "驾驶证发证机关不能为空")
     private String licenceIssueOrganization;
     @ApiModelProperty(value = "身份证住址", required = true)
-    @NotBlank(message = "身份证住址不能为空")
+//    @NotBlank(message = "身份证住址不能为空")
     private String idCardAddress = "手动";
 
 }

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildBrokerParam.java

@@ -24,13 +24,13 @@ public class ThirdOrderChildBrokerParam {
     @NotBlank(message = "车牌号不能为空")
     private String truckNo;
 
-    @ApiModelProperty(value = "运费单价 单位分", dataType="Integer", required = true)
+    @ApiModelProperty(value = "运费单价 单位分 (司机运费单价)", dataType="Integer", required = true)
     @NotNull(message = "运费单价不能为空")
     private Integer freightPrice;
-    @ApiModelProperty(value = "运费 单位分", dataType="Integer", required = true)
+    @ApiModelProperty(value = "运费 单位分 (含税金额)", dataType="Integer", required = true)
     @NotNull(message = "运费不能为空")
     private Integer freight;
-    @ApiModelProperty(value = "实付运费 单位分", dataType="Integer", required = true)
+    @ApiModelProperty(value = "实付运费 单位分 (司机运费总价)", dataType="Integer", required = true)
     @NotNull(message = "实付运费不能为空")
     private Integer freightNoCard;
     @ApiModelProperty(value = "溢价金额", dataType = "Integer", required = true)
@@ -39,6 +39,9 @@ public class ThirdOrderChildBrokerParam {
     @ApiModelProperty(value = "净重", dataType="BigDecimal", required = true)
     @NotNull(message = "净重不能为空")
     private BigDecimal net;
+    @ApiModelProperty(value = "装车净重", dataType="BigDecimal")
+    @NotNull(message = "装车净重不能为空")
+    private BigDecimal loadNet;
 
     @ApiModelProperty(value = "发货地址", dataType="String", required = true)
     @NotBlank(message = "发货地址不能为空")
@@ -53,7 +56,7 @@ public class ThirdOrderChildBrokerParam {
     @NotBlank(message = "货源所在区县不能为空")
     private String sendCounty;
     @ApiModelProperty(value = "货源所在乡镇", dataType="String", required = true)
-    @NotBlank(message = "货源所在乡镇不能为空")
+//    @NotBlank(message = "货源所在乡镇不能为空")
     private String sendTown;
     @ApiModelProperty(value = "发货人", dataType="String", required = true)
     @NotBlank(message = "发货人不能为空")
@@ -72,7 +75,7 @@ public class ThirdOrderChildBrokerParam {
     @NotBlank(message = "收货人所在区县不能为空")
     private String receiveCounty;
     @ApiModelProperty(value = "收货人所在乡镇", dataType="String", required = true)
-    @NotBlank(message = "收货人所在乡镇不能为空")
+//    @NotBlank(message = "收货人所在乡镇不能为空")
     private String receiveTown = "手动";
     @ApiModelProperty(value = "收货地址", dataType="String", required = true)
     @NotBlank(message = "收货地址不能为空")
@@ -156,7 +159,7 @@ public class ThirdOrderChildBrokerParam {
     @ApiModelProperty(value = "源开票金额 (开票金额)")
     @NotNull(message = "源开票金额不能为空")
     private BigDecimal sourceInvoicingPrice;
-    @ApiModelProperty(value = "源亏吨金额 (亏吨扣款)")
+    @ApiModelProperty(value = "源亏吨金额 (亏吨金额)")
     @NotNull(message = "源亏吨金额不能为空")
     private BigDecimal sourceLossPrice;
 

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderInfoDTO.java

@@ -33,7 +33,7 @@ public class ThirdOrderInfoDTO {
     @NotBlank(message = "发货所在区县不能为空")
     private String sendCounty;
     @ApiModelProperty(value = "发货所在乡镇", required = true)
-    @NotBlank(message = "发货所在乡镇不能为空")
+//    @NotBlank(message = "发货所在乡镇不能为空")
     private String sendTown;
     @ApiModelProperty(value = "发货详细地址", required = true)
     @NotBlank(message = "发货详细地址不能为空")
@@ -63,7 +63,7 @@ public class ThirdOrderInfoDTO {
     @NotBlank(message = "收货人所在区县不能为空")
     private String receiveCounty;
     @ApiModelProperty(value = "收货人所在乡镇", required = true)
-    @NotBlank(message = "收货人所在乡镇不能为空")
+//    @NotBlank(message = "收货人所在乡镇不能为空")
     private String receiveTown;
     @ApiModelProperty(value = "收货详细地址", required = true)
     @NotBlank(message = "收货详细地址不能为空")

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

@@ -69,7 +69,7 @@ public class SettlementServiceImpl implements SettlementService {
         } else {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
             //是否通过风控,调用网络货运
-            ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail);
+            ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
             String result = transportFeignService.orderChildSync(param);
             System.out.println(result);
             if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {