提交 5ca01445 authored 作者: 刘海泉's avatar 刘海泉

Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17

Former-commit-id: ec160e68
...@@ -503,17 +503,8 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -503,17 +503,8 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
List<String> completedOrderGoodsNo = new ArrayList<>(); List<String> completedOrderGoodsNo = new ArrayList<>();
for (OrderGoods item : orderGoods) { for (OrderGoods item : orderGoods) {
if(!Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){ if(!Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
completedOrderGoodsNo.add(item.getOrderGoodsNo());
}else{
totalNeedTruck = totalNeedTruck + item.getNeedTruckNum(); totalNeedTruck = totalNeedTruck + item.getNeedTruckNum();
} }
}
}
if(CollectionUtils.isNotEmpty(completedOrderGoodsNo)){
Long count = orderChildDao.countNotCancelOrderChild(completedOrderGoodsNo);
totalNeedTruck = totalNeedTruck + count.intValue();
} }
return totalNeedTruck; return totalNeedTruck;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论