|
@@ -1,15 +1,14 @@
|
|
package org.jeecg.modules.admin_order.service.impl;
|
|
package org.jeecg.modules.admin_order.service.impl;
|
|
|
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
import cn.hutool.core.io.FileUtil;
|
|
-import cn.hutool.core.thread.ThreadFactoryBuilder;
|
|
|
|
import cn.hutool.core.thread.ThreadUtil;
|
|
import cn.hutool.core.thread.ThreadUtil;
|
|
import cn.hutool.core.util.ZipUtil;
|
|
import cn.hutool.core.util.ZipUtil;
|
|
-import cn.hutool.json.JSON;
|
|
|
|
import cn.hutool.json.JSONArray;
|
|
import cn.hutool.json.JSONArray;
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.google.common.base.Strings;
|
|
import com.google.common.base.Strings;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.modules.admin.entity.AdminPlatform;
|
|
import org.jeecg.modules.admin.entity.AdminPlatform;
|
|
@@ -43,8 +42,10 @@ import java.io.File;
|
|
import java.io.FileWriter;
|
|
import java.io.FileWriter;
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
-import java.util.*;
|
|
|
|
-import java.util.concurrent.Future;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Collection;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description: 订单管理
|
|
* @Description: 订单管理
|
|
@@ -53,6 +54,7 @@ import java.util.concurrent.Future;
|
|
* @Version: V1.0
|
|
* @Version: V1.0
|
|
*/
|
|
*/
|
|
@Service
|
|
@Service
|
|
|
|
+@Slf4j
|
|
public class AdminOrderServiceImpl extends ServiceImpl<AdminOrderMapper, AdminOrder> implements IAdminOrderService {
|
|
public class AdminOrderServiceImpl extends ServiceImpl<AdminOrderMapper, AdminOrder> implements IAdminOrderService {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -304,9 +306,11 @@ public class AdminOrderServiceImpl extends ServiceImpl<AdminOrderMapper, AdminOr
|
|
}
|
|
}
|
|
ArrayList<String> genFileNameList = new ArrayList<>();
|
|
ArrayList<String> genFileNameList = new ArrayList<>();
|
|
for (String orderId : orderIdList) {
|
|
for (String orderId : orderIdList) {
|
|
|
|
+ log.info("》》》》》》正在导出订单:{}",orderId);
|
|
String fileName = generatePdfFile(orderId, outputFolder);
|
|
String fileName = generatePdfFile(orderId, outputFolder);
|
|
if (Strings.isNullOrEmpty(fileName)) continue;
|
|
if (Strings.isNullOrEmpty(fileName)) continue;
|
|
genFileNameList.add(fileName);
|
|
genFileNameList.add(fileName);
|
|
|
|
+ log.info("《《《《《《结束导出订单:{}",orderId);
|
|
}
|
|
}
|
|
return genFileNameList;
|
|
return genFileNameList;
|
|
}
|
|
}
|