虚拟号修改

xuhy

6 天以前 89351ad17c81b37495f21d4dfbf28f0d306a155a

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -38,6 +38,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

/**
 * <p>
@@ -142,10 +143,19 @@
    public Page<Order> queryPage(OrderQueryRequest orderQueryRequest) {
        Page<Order> page = Page.of(orderQueryRequest.getPageNum(), orderQueryRequest.getPageSize());
        // 基础查询

        Page<Order> pageList = baseMapper.queryPage(orderQueryRequest, page);

        List<Order> records = pageList.getRecords();
        if(CollectionUtils.isEmpty(records)){
            return pageList;
        }
        List<String> orderIds = records.stream().map(Order::getId).collect(Collectors.toList());

        List<ChangeDispatch> list = changeDispatchService.lambdaQuery()
                .eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).list();
                .orderByDesc(ChangeDispatch::getCreateTime)
                .in(ChangeDispatch::getOrderId, orderIds).list();
        for (Order order : pageList.getRecords()) {
            ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
                    .findFirst().orElse(null);
@@ -223,7 +233,7 @@
    @Override
    public Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
        Page<Order> orderPage = baseMapper.orderListWorker(userId, state, searchValues, Page.of(pageNum, pageSize));
        return baseMapper.orderListWorker(userId, state,searchValues, Page.of(pageNum, pageSize));
        return orderPage;
    }

    @Override