Commit 76462236 authored by 年畅's avatar 年畅 🛀

fix

parent 449af70a
......@@ -681,7 +681,7 @@ public class OrderRoutingServiceImpl implements OrderRoutingService, Initializin
logger.info("orderConvert,convert_order_last_id_1:{}, count:{}, i:{}, j:{}, sellerId:{}",
lastId, count, i, j, sellerId);
Result<String> redisData = redisManager.get("convert_order_shut_down_key_44");
Result<String> redisData = redisManager.get("convert_order_shut_down_key_45");
if (redisData.isStatus() && Objects.nonNull(redisData.getData())) {
logger.info("[orderConvert]shut down!");
return;
......@@ -1144,11 +1144,11 @@ public class OrderRoutingServiceImpl implements OrderRoutingService, Initializin
long s = System.currentTimeMillis();
List<Order> converted = new ArrayList<>(orderList.size());
List<Order> orders1 = filterAt(orderList);
if (CollectionUtils.isEmpty(orders1)) {
return;
}
orders1.forEach(each -> {
// List<Order> orders1 = filterAt(orderList);
// if (CollectionUtils.isEmpty(orders1)) {
// return;
// }
orderList.forEach(each -> {
// 枚举值
Order newOrder = (Order) orderStreamConverter.streamIn(each);
converted.add(newOrder);
......@@ -1348,6 +1348,9 @@ public class OrderRoutingServiceImpl implements OrderRoutingService, Initializin
query.setSize(2000);
query.setOrderNoList(converted.stream().map(Order::getOrderNo).collect(Collectors.toList()));
List<OrderPayDetails> payDetailsList = commonManager.scanPayDetailsList(query, i, j);
if (CollectionUtils.isEmpty(payDetailsList)) {
return;
}
Map<String, List<Order>> orderMap = converted.stream().collect(Collectors.groupingBy(Order::getOrderNo));
List<OrderPayDetails> payConverted = new ArrayList<>(converted.size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment