Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

@@ -158,6 +158,10 @@ public class OrderGoodsVO {
     @ApiModelProperty("接单保证金（分/车）")
     private BigDecimal deposit;
 
+    @ApiModelProperty("是否支持借款：0:否 1:是")
+    private Integer supportLoan;
+
+
     @ApiModelProperty("结算方式  1装车净重 2卸车净重")
     private Integer settlementWay;
 

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -203,6 +203,9 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("接单保证金（分/车）")
     private BigDecimal deposit;
 
+    @ApiModelProperty("是否支持借款：0:否 1:是")
+    private Integer supportLoan;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

performance-web/src/main/java/com/clx/performance/strategy/impl/OwnGoodsOrderStrategy.java

@@ -186,6 +186,7 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
             orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
             orderGoods.setDeposit(orderInfoFeign.getDeposit());
+            orderGoods.setSupportLoan(orderInfoFeign.getSupportLoan());
 
             List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo);
             if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) {

performance-web/src/main/java/com/clx/performance/strategy/impl/PartGoodsOrderStrategy.java

@@ -188,6 +188,7 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
             orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
             orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
             orderGoods.setDeposit(orderInfoFeign.getDeposit());
+            orderGoods.setSupportLoan(orderInfoFeign.getSupportLoan());
 
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);

performance-web/src/main/java/com/clx/performance/strategy/impl/PlatformGoodsOrderStrategy.java

@@ -182,6 +182,7 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
             orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
             orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
             orderGoods.setDeposit(orderInfoFeign.getDeposit());
+            orderGoods.setSupportLoan(orderInfoFeign.getSupportLoan());
 
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);