|
@@ -40,9 +40,7 @@ import java.io.IOException;
|
|
import java.net.URLEncoder;
|
|
import java.net.URLEncoder;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.concurrent.CountDownLatch;
|
|
import java.util.concurrent.CountDownLatch;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.Executors;
|
|
import java.util.concurrent.Executors;
|
|
@@ -314,6 +312,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
@Override
|
|
@Override
|
|
public List<NewOrderTarget> exportOrderData(TAdmin admin, List<TOrder> list) {
|
|
public List<NewOrderTarget> exportOrderData(TAdmin admin, List<TOrder> list) {
|
|
List<NewOrderTarget> orderTargets = new ArrayList<>();
|
|
List<NewOrderTarget> orderTargets = new ArrayList<>();
|
|
|
|
+ Map<String, String> nameMap = new HashMap<>();
|
|
for (TOrder order : list) {
|
|
for (TOrder order : list) {
|
|
if (!order.getProductName().equals("优惠码")) {
|
|
if (!order.getProductName().equals("优惠码")) {
|
|
NewOrderTarget orderTarget = new NewOrderTarget();
|
|
NewOrderTarget orderTarget = new NewOrderTarget();
|
|
@@ -325,6 +324,18 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
orderTarget.setPrice(order.getPrice());
|
|
orderTarget.setPrice(order.getPrice());
|
|
}
|
|
}
|
|
orderTarget.setClientId(order.getClientId());
|
|
orderTarget.setClientId(order.getClientId());
|
|
|
|
+ String name = "";
|
|
|
|
+ name = nameMap.get(order.getClientId());
|
|
|
|
+ if (order.getEquipmentId() != null && StringUtils.isEmpty(name)) {
|
|
|
|
+ TEquipment equipment = R.getDataIfSuccess(szwlFeign.findById(String.valueOf(order.getEquipmentId())));
|
|
|
|
+ if (StringUtils.isNotEmpty(equipment.getName())) {
|
|
|
|
+ name = equipment.getName();
|
|
|
|
+ } else {
|
|
|
|
+ name = "暂未设置名称";
|
|
|
|
+ }
|
|
|
|
+ nameMap.put(order.getClientId(), name);
|
|
|
|
+ }
|
|
|
|
+ orderTarget.setMachineName(name);
|
|
orderTarget.setName(admin.getUsername());
|
|
orderTarget.setName(admin.getUsername());
|
|
// 格式化时间
|
|
// 格式化时间
|
|
if (order.getPayDate() != null) {
|
|
if (order.getPayDate() != null) {
|