Merge remote-tracking branch 'origin/test' into test

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

@@ -208,4 +208,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
 
     List<OrderChild> listChidNosByStatus(List<Integer> status);
+
 }

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

@@ -75,8 +75,6 @@ public class OrderChildDtsListener  {
     private final RabbitTemplate rabbitTemplate;
 
 
-
-
     @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
     public void onMessage(Message message) {
         try {
@@ -121,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/impl/OrderChildServiceImpl.java

@@ -1935,7 +1935,6 @@ public class OrderChildServiceImpl implements OrderChildService {
             return PerformanceResultEnum.APP_POP_UP_OWNER_WALLET_NULL_NOT_EXIST_ERROR;
         }
         //判断是司机还是车主
-        //司机和车主钱包相同，说明是车主
         boolean truckOwnerFlag = Objects.equals(driverWallCode, truckWalletCode);
         Integer checkWalletCode = truckOwnerFlag ? driverWallCode : truckWalletCode;
         Result<WalletResidueCardDTO> result = feignPaymentService.getWallet(checkWalletCode);

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())){