Merge remote-tracking branch 'origin/v21.1_bug_performance_progress_20240806' into test

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -205,4 +205,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> listBeforeCompleteByOrderNo(String orderNo);
 
     List<OrderChild> listCompleteByOrderNos(List<String> strings);
+
 }

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

@@ -16,16 +16,19 @@ import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.OrderChildPoundAuditEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.OrderChildPoundAuditEnum;
 import com.clx.performance.event.OrderChildCancelEvent;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.service.LastTruckService;
 import com.clx.performance.struct.OrderChildStruct;
 import com.clx.user.feign.TruckFeign;
@@ -72,8 +75,6 @@ public class OrderChildDtsListener  {
     private final RabbitTemplate rabbitTemplate;
 
 
-
-
     @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
     public void onMessage(Message message) {
         try {
@@ -118,7 +119,7 @@ public class OrderChildDtsListener  {
 
             }
         } catch (Exception e) {
-            log.info("DTS消息同步失败, database:clx_performance.order_child, error:{}", e.getMessage(), e);
+            log.info("DTS消息同步失败, database:clx_performance.order_child, error:{}", e.getMessage());
         }
     }
 

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -110,4 +110,6 @@ public interface OrderChildService {
 
 
     List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo);
+
+
 }

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

@@ -59,6 +59,8 @@ import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
+import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.enums.idcard.IdCardEnum;
 import com.clx.user.feign.DocumentFeign;

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

@@ -130,7 +130,10 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                         item.setSeniorLogisticsManagerName(Joiner.on(",")
                                 .join(JSON.parseArray(item.getSeniorLogisticsManagerName())));
                     }
-                    if(Objects.nonNull(item.getPendingWeight()) && Objects.nonNull(item.getOrderedWeight())){
+                    if(Objects.nonNull(item.getPendingWeight())
+                            && item.getPendingWeight().compareTo(BigDecimal.ZERO) != 0
+                            && Objects.nonNull(item.getOrderedWeight())
+                            && item.getOrderedWeight().compareTo(BigDecimal.ZERO) != 0){
                         item.setOrderedRate(calcOrderedRate(item.getOrderedWeight(),item.getPendingWeight()));
                     }
                     if(Objects.nonNull(item.getTaskWeight()) && Objects.nonNull(item.getSumUnloadWeight())){