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-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
index 11b6fe3..acc252f 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
@@ -5,9 +5,12 @@
import com.alibaba.excel.write.builder.ExcelWriterBuilder;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.mapper.OrderMapper;
+import com.ruoyi.admin.mapper.OrderRecordingMapper;
import com.ruoyi.admin.mapper.UserMapper;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.service.OrderService;
@@ -16,6 +19,7 @@
import com.ruoyi.admin.vo.*;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.api.entity.OrderQueryRequest;
import com.ruoyi.order.api.entity.ServeRecord;
import com.ruoyi.order.api.feignClient.EvaluateClient;
import com.ruoyi.order.api.feignClient.OrderClient;
@@ -64,6 +68,8 @@
private EvaluateClient evaluateClient;
@Resource
private ServeRecordClient serveRecordClient;
+ @Resource
+ private OrderRecordingMapper orderRecordingMapper;
/**
* linux服务器保存订单轨迹文件夹
@@ -215,7 +221,13 @@
orderInfo.setOrderNumber(order.getOrderNumber());
orderInfo.setPlaceOrderTime(order.getCreateTime());
orderInfo.setState(order.getState());
+ orderInfo.setRemark(order.getRemark());
+ orderInfo.setCompleteTime(order.getCompleteTime());
orderInfo.setReservationRemark(order.getReservationRemark());
+ // 查询通话录音
+ List<OrderRecording> orderRecordingList = orderRecordingMapper.selectList(Wrappers.lambdaQuery(OrderRecording.class)
+ .eq(OrderRecording::getOrderId, order.getId()));
+ orderInfo.setOrderRecordingList(orderRecordingList);
}
result.setOrderInfo(orderInfo);
}
@@ -238,5 +250,15 @@
orderByUserInfo.setTime(order.getTime());
result.setUserInfo(orderByUserInfo);
}
-
+ /**
+ * 订单id列表
+ *
+ * @param orderQueryRequest 订单列表查询参数
+ * @return 订单id列表
+ */
+ @Override
+ public List<String> queryIdList(OrderQueryRequest orderQueryRequest) {
+ List<String> data = orderClient.queryPage1(orderQueryRequest).getData();
+ return data;
+ }
}
--
Gitblit v1.7.1