Merge remote-tracking branch 'origin/v12.0_last_truck_20240306' into release

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -63,7 +63,7 @@ public class OrderChildDtsListener  {
                     orderChildChangeAfter(after);
                 }
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
-                log.info("修改:{}"+after);
+                log.info("修改:{}",after);
                 if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) &&
                         (!Objects.equals(before.getStatus(),after.getStatus()) || !Objects.equals(before.getLoadNet(),after.getLoadNet()))){
                     orderChildChangeAfter(after);

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

@@ -49,10 +49,10 @@ public class LastTruckServiceImpl implements LastTruckService {
             return null;
         }
         BigDecimal weight = orderChildDao.listAfterArrayReceiveChild(orderNo);
-        //判断当前订单下所有到达目的地之后的运单的装车吨数 + 向下浮动量 >= 订单拉运吨数
-        log.info("订单号:{} ,计算是否到达可计算最后一车标准，运单累计拉运吨数：{}, 向下浮动量:{},订单拉运吨数:{}",
-                orderNo,weight,orderInfo.getDownFloatWeight(),orderInfo.getTransportWeight());
-        if(Objects.nonNull(weight) && weight.add(new BigDecimal(orderInfo.getDownFloatWeight())).compareTo(orderInfo.getTransportWeight()) >= 0){
+        //判断当前订单下所有到达目的地之后的运单的装车吨数  >= （订单拉运吨数 -35吨）
+        log.info("订单号:{} ,计算是否到达可计算最后一车标准，运单累计拉运吨数：{}, 订单拉运吨数:{}",
+                orderNo,weight,orderInfo.getTransportWeight());
+        if(Objects.nonNull(weight) && weight.compareTo(orderInfo.getTransportWeight().subtract(new BigDecimal("35"))) >= 0){
             //查询最后一车的运单
             OrderChild child = orderChildDao.getLastTruckChild(orderNo);
             log.info("当前订单计算出最后一车，运单编号：{} ", child.getChildNo());

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

@@ -317,7 +317,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 订单数量限制
         // 订单已拉运吨数
         BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
-        if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 0){
+        if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(new BigDecimal("35"))) > 0){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }
 

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.settle;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.OwnerAccountPasswordDao;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.NetworkSyncComponent;
@@ -22,6 +23,8 @@ import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.model.OwnerAccountPassword;
+import com.clx.performance.enums.PlatformAccountConfigEnum;
+import com.clx.performance.enums.settle.*;
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;