|
@@ -1189,6 +1189,16 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
List<LiveOrderItemVo> liveOrderItemVos = orderItemsMap.get(orderId);
|
|
List<LiveOrderItemVo> liveOrderItemVos = orderItemsMap.get(orderId);
|
|
|
if(CollectionUtils.isNotEmpty(liveOrderItemVos)) {
|
|
if(CollectionUtils.isNotEmpty(liveOrderItemVos)) {
|
|
|
order.setOrderItemList(liveOrderItemVos);
|
|
order.setOrderItemList(liveOrderItemVos);
|
|
|
|
|
+ // 根据子订单的isAfterSales更新外层订单的isAfterSales
|
|
|
|
|
+ // 只有当外层订单当前isAfterSales为1且所有子订单isAfterSales都为0时,才设置为0
|
|
|
|
|
+ Integer orderIsAfterSales = order.getIsAfterSales();
|
|
|
|
|
+ if (orderIsAfterSales != null && orderIsAfterSales == 1) {
|
|
|
|
|
+ boolean anyAfterSales = liveOrderItemVos.stream()
|
|
|
|
|
+ .anyMatch(item -> item.getIsAfterSales() != null && item.getIsAfterSales() == 1);
|
|
|
|
|
+ if (!anyAfterSales) {
|
|
|
|
|
+ order.setIsAfterSales(0);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|