虚拟号修改

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>
@@ -117,24 +118,44 @@

    @Override
    public List<Order> excelExport(OrderQueryRequest orderQueryRequest) {
        List<String> ids = orderQueryRequest.getIds();
        List<Order> list;
        if (null != ids && !ids.isEmpty()) {
            list = baseMapper.exportByIdList(ids);
        } else {
            list = baseMapper.exportList(orderQueryRequest);
//        List<String> ids = orderQueryRequest.getIds();
//        List<Order> list;
//        if (null != ids && !ids.isEmpty()) {
//            list = baseMapper.exportByIdList(ids);
//        } else {
//            list = baseMapper.exportList(orderQueryRequest);
//        }
        List<Order> orders = baseMapper.excelExportList(orderQueryRequest);
        List<ChangeDispatch> list = changeDispatchService.lambdaQuery()
                .eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).list();
        for (Order order : orders) {
            ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
                    .findFirst().orElse(null);
            if (null != changeDispatch) {
                order.setApplyReason(changeDispatch.getApplyReason());
            }
        }
        return list;
        return orders;
    }

    @Override
    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);
@@ -169,9 +190,10 @@
            Integer completed = order.getCompleted();
            Integer canceled = order.getCanceled();
            Integer reInvestment = order.getReInvestment();
            int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment;
            Integer pending = order.getPending();
            int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment + pending;
            return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
                    toBeCompleted, completed, canceled, reInvestment);
                    toBeCompleted, completed, canceled, reInvestment,pending);

    }

@@ -209,8 +231,9 @@
    }

    @Override
    public Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
        return baseMapper.orderListWorker(userId, state, Page.of(pageNum, pageSize));
    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 orderPage;
    }

    @Override
@@ -357,6 +380,7 @@
        order.setAddress("");
        order.setCity(cityCode.getData().getCity());
        order.setCityCode(cityCode.getData().getCityCode());
        order.setIsOpenVirtualNumber(1);
        this.save(order);
        return String.valueOf(order.getId());
    }