解决冲突

skyouc

2025-11-27 af1722ee7ded25e74e5f2afaf212ab856c942d77

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java

@@ -16,6 +16,7 @@

import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

@Service("waveOrderRelaService")
@@ -32,7 +33,7 @@
        if (orderRelas.isEmpty()) {
            return R.ok();
        }
        List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList());
        Set<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toSet());
        PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
        QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
        wrapper.in("id", orderIds);