clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

判断是否全部派单的逻辑改回

This commit is contained in:
HH 2023-04-20 11:58:33 +08:00
parent a72d302696
commit 67aaad5519
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -457,12 +457,11 @@ public class OrderMasterServiceImpl implements OrderMasterService {
Assert.notNull(orderMaster, "OrderMaster is null!!!");
// 先判断主订单是否派完单
List<OrderGoods> masterGoods = orderGoodsService.selectByOrderMasterId(orderMasterId);
for (OrderGoods orderGoods : masterGoods) {
// 是否有未派完的子单
if (!orderGoods.getGoodsNum().equals(orderGoods.getServerGoodsNum())) {
return false;
}
}
return true;
long masterCount = masterGoods.stream().mapToInt(OrderGoods::getGoodsNum).sum();
long detailCount = orderDetailService.selectByOrderMasterId(orderMasterId).stream().mapToInt(x -> {
List<OrderGoods> detailGoods = orderGoodsService.selectByOrderDetailId(x.getId());
return detailGoods.stream().mapToInt(OrderGoods::getGoodsNum).sum();
}).sum();
return masterCount == detailCount;
}
}