Merge remote-tracking branch 'origin/v17.5_order_child_sync_broker_20240617'…

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -181,6 +181,14 @@ public class OrderChildVO {
     @ApiModelProperty("最晚装货时间")
     private String lastLoadTime;
 
+    @MoneyOutConvert
+    @ApiModelProperty("平台服务费")
+    private BigDecimal platformServiceFee;
+    @ApiModelProperty("平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+    @MoneyOutConvert
+    @ApiModelProperty("接单保证金（元/车）")
+    private BigDecimal deposit;
 
     //结算信息
     @ApiModelProperty(value = "实际运费", example = "1.23")

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

@@ -99,6 +99,9 @@ public class OrderChild implements HasKey<Integer> {
     private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
     private Integer reportFlag;  //是否上报 0-否;1-是
 
+    private BigDecimal platformServiceFee;                  //平台服务费（分）
+    private BigDecimal platformServiceFeeRate;              //平台服务费费率%
+    private BigDecimal deposit;                             //接单保证金（分/车）
 
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -416,6 +416,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
         orderChild.setReportFlag(orderInfo.getReportFlag());
 
+        // 平台服务费
+        orderChild.setPlatformServiceFeeRate(orderGoods.getPlatformServiceFeeRate());
+        orderChild.setPlatformServiceFee(orderChild.getPlatformServiceFeeRate()!=null
+                ? orderChild.getFreight().multiply(orderChild.getPlatformServiceFeeRate())
+                : null);
+        orderChild.setDeposit(orderGoods.getDeposit());
+
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, orderChild);
 

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/SettlementPlatformServiceFeeSqlProvider.java

@@ -24,8 +24,8 @@ public class SettlementPlatformServiceFeeSqlProvider {
             if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
             if (Objects.nonNull(param.getDriverUserNo())) {WHERE("driver_user_no = #{param.driverUserNo}");}
 
-            if (Objects.nonNull(param.getBeginTime())) {WHERE("begin_time >= #{param.beginTime}");}
-            if (Objects.nonNull(param.getEndTime())) {WHERE("begin_time <= #{param.endTime}");}
+            if (Objects.nonNull(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
+            if (Objects.nonNull(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}
 
             ORDER_BY("id desc");
         }}.toString();