修改测试问题

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

@@ -133,7 +133,8 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         if(StringUtils.isNotBlank(truckNo)){
             query.eq(OrderGoodsTruckBind::getTruckNo, truckNo);
         }
-        query.in(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
+        query.in(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),
+                OrderGoodsTruckBindEnum.Status.GET.getCode(), OrderGoodsTruckBindEnum.Status.SUCCESS.getCode());
         query.orderByDesc(OrderGoodsTruckBind :: getCreateTime);
         return baseMapper.selectList(query);
     }

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

@@ -54,7 +54,6 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     public boolean updateFinalPaymentStatusBySettlementNo(String settlementNo, Integer finalPaymentStatus){
         return update(lUdWrapper()
                 .eq(SettlementOwnerDetail::getSettlementNo, settlementNo)
-                .ne(SettlementOwnerDetail::getSettlementFreight, 0)
                 .set(SettlementOwnerDetail::getFinalPaymentStatus, finalPaymentStatus)
         );
     }

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

@@ -339,15 +339,13 @@ public class TruckServiceImpl implements TruckService {
         Map<String,Integer> truckStatusMap = this.getTruckStatusMap();
 
         List<OrderGoodsTruckListVO> result = new ArrayList<>();
-        truckList.stream().forEach(item->{
-            Integer orderedStatus = Objects.equals(OrderGoodsTruckBindEnum.Status.GET.getCode(),item.getStatus())?1:0;
+        truckList.forEach(item->{
+            Integer orderedStatus = Objects.equals(OrderGoodsTruckBindEnum.Status.GET.getCode(),item.getStatus())
+                    || Objects.equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(),item.getStatus())?1:0;
             OrderGoodsTruckListVO vo = OrderGoodsTruckListVO.builder().truckNo(item.getTruckNo()).truckLevel("A").
                     truckUseStatus(truckStatusMap.get(item.getTruckNo())).orderedStatus(orderedStatus).build();
             result.add(vo);
         });
-
-
-
         String orderNo = truckList.get(0).getOrderNo();
         GeoResults<RedisGeoCommands.GeoLocation<String>> sortResult = this.vicinityTruckList(orderNo,Integer.MAX_VALUE,Integer.MAX_VALUE);
         if(Objects.isNull(sortResult)){