From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
index 7a72e3f..4ea2008 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
@@ -40,7 +40,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -218,6 +220,7 @@
while (iterator.hasNext()){
AnalysisOrderData analysisOrderData = iterator.next();
try {
+ analysisOrderData.setDataType(1);
analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(analysisOrderData.getOrderDateStr()));
}catch (Exception e){
errors.add("回收订单编号:["+analysisOrderData.getOrderNum()+"],时间格式化错误,忽略导入");
@@ -248,18 +251,25 @@
orders.forEach(order -> {
AnalysisOrderData analysisOrderData = new AnalysisOrderData();
analysisOrderData.setOrderNum(order.getOrderNumber());
- analysisOrderData.setOrderDate(order.getCreateTime());
-// analysisOrderData.setOrderChannel(order.getOrderChannel());
+ try {
+ analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(order.getTime()));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ analysisOrderData.setOrderChannel(order.getSiteName());
analysisOrderData.setCity(order.getCity());
analysisOrderData.setOrderCategory(order.getServeName());
analysisOrderData.setUserName(order.getReservationName());
analysisOrderData.setUserPhone(order.getReservationPhone());
analysisOrderData.setRecyclePerson(order.getServerName());
analysisOrderData.setState(order.getState());
+ analysisOrderData.setImportTime(LocalDateTime.now());
+ analysisOrderData.setDataType(2);
analysisOrderDataList.add(analysisOrderData);
});
// 删除今日订单
analysisOrderDataService.remove(new QueryWrapper<AnalysisOrderData>().lambda()
+ .eq(AnalysisOrderData::getDataType,2)
.like(AnalysisOrderData::getOrderDate, new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
);
analysisOrderDataService.saveBatch(analysisOrderDataList);
--
Gitblit v1.7.1