From 89351ad17c81b37495f21d4dfbf28f0d306a155a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:23:05 +0800
Subject: [PATCH] 虚拟号修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 93 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 42de2ee..24685ca 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1,4 +1,5 @@
package com.ruoyi.order.service.impl;
+import java.util.Date;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,6 +38,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
/**
* <p>
@@ -116,27 +118,47 @@
@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)
+ .in(ChangeDispatch::getOrderId, orderIds).list();
for (Order order : pageList.getRecords()) {
- ChangeDispatch changeDispatch = changeDispatchService.lambdaQuery()
- .eq(ChangeDispatch::getOrderId, order.getId())
- .eq(ChangeDispatch::getIsDelete, 0)
- .orderByDesc(ChangeDispatch::getCreateTime)
- .last("limit 1").one();
+ ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
+ .findFirst().orElse(null);
if (null != changeDispatch) {
order.setApplyReason(changeDispatch.getApplyReason());
}
@@ -160,34 +182,19 @@
@Override
public OrderPageCountVO orderPageCount(OrderQueryRequest orderQueryRequest) {
- List<Order> orderList = baseMapper.orderPageCount(orderQueryRequest);
- int total = 0;
- int toBeDispatched = 0;
- int stayDoorstep = 0;
- int toBeCompleted = 0;
- int completed = 0;
- int canceled = 0;
- int reInvestment = 0;
- for (Order order : orderList) {
- total++;
- Integer state = order.getState();
- if (Constants.ZERO.equals(state)) {
- toBeDispatched++;
- } else if (Constants.ONE.equals(state)) {
- stayDoorstep++;
- } else if (Constants.TWO.equals(state)) {
- toBeCompleted++;
- } else if (Constants.THREE.equals(state)) {
- completed++;
- } else if (Constants.FOUR.equals(state)) {
- canceled++;
- }
- if (order.getState().equals(Constants.SIX)) {
- reInvestment++;
- }
- }
- return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
- toBeCompleted, completed, canceled, reInvestment);
+ Order order = baseMapper.orderPageCount(orderQueryRequest);
+
+ Integer toBeDispatched = order.getToBeDispatched();
+ Integer stayDoorstep = order.getStayDoorstep();
+ Integer toBeCompleted = order.getToBeCompleted();
+ Integer completed = order.getCompleted();
+ Integer canceled = order.getCanceled();
+ Integer reInvestment = order.getReInvestment();
+ Integer pending = order.getPending();
+ int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment + pending;
+ return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
+ toBeCompleted, completed, canceled, reInvestment,pending);
+
}
@Override
@@ -224,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
@@ -372,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());
}
--
Gitblit v1.7.1