Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into release

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

@@ -115,6 +115,9 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                 .or()
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
                 .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
+                .or()
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
         );
     }
 

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

@@ -386,9 +386,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo);
         List<OrderGoodsTruckBind> getChildList = null;
         if (CollectionUtils.isNotEmpty(truckBindList)) {
-            List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i -> !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
-            //已接单的记录
-            getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
+            List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i ->
+                    !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode()) &&
+            !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+            ).collect(Collectors.toList());
+            //已接单的记录和完成的
+            getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())
+                    || i.getStatus().equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                    )
+                    .collect(Collectors.toList());
 
             if (CollectionUtils.isNotEmpty(deleteList)) {
                 orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList()));

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

@@ -85,9 +85,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
-        if(settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0){
-            settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
-        }
 
         settlementOwnerDetailDao.saveEntity(settlementOwnerDetail);