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

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

@@ -404,6 +404,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();