|
@@ -53,6 +53,7 @@ public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
|
|
|
event.isVip(), event.getShowroomId(), event.getOrderType(), null, event
|
|
event.isVip(), event.getShowroomId(), event.getOrderType(), null, event
|
|
|
.getCollectionIds(), null);
|
|
.getCollectionIds(), null);
|
|
|
List<Order> subOrders = new ArrayList<>();
|
|
List<Order> subOrders = new ArrayList<>();
|
|
|
|
|
+ List<Long> successOrderIds = new ArrayList<>();
|
|
|
collectionIds.forEach(id -> {
|
|
collectionIds.forEach(id -> {
|
|
|
try {
|
|
try {
|
|
|
log.info("收到子订单创建消息: {}", event.getId());
|
|
log.info("收到子订单创建消息: {}", event.getId());
|
|
@@ -61,9 +62,10 @@ public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
|
|
|
event.isVip(), event.getShowroomId(), OrderType.SUB, order.getId(), null, order
|
|
event.isVip(), event.getShowroomId(), OrderType.SUB, order.getId(), null, order
|
|
|
.getId() + Long.parseLong(id));
|
|
.getId() + Long.parseLong(id));
|
|
|
subOrders.add(subOrder);
|
|
subOrders.add(subOrder);
|
|
|
|
|
+ successOrderIds.add(Long.parseLong(id));
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.info("创建子订单出错: {}", event.getId() + "collectionId:" + id);
|
|
log.info("创建子订单出错: {}", event.getId() + "collectionId:" + id);
|
|
|
- collectionIds.remove(id);
|
|
|
|
|
|
|
+// collectionIds.remove(id);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
BigDecimal total = subOrders.stream().map(Order::getTotalPrice).reduce(BigDecimal::add)
|
|
BigDecimal total = subOrders.stream().map(Order::getTotalPrice).reduce(BigDecimal::add)
|
|
@@ -73,7 +75,7 @@ public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
|
|
|
BigDecimal price = subOrders.stream().map(Order::getPrice).reduce(BigDecimal::add)
|
|
BigDecimal price = subOrders.stream().map(Order::getPrice).reduce(BigDecimal::add)
|
|
|
.orElse(BigDecimal.ZERO);
|
|
.orElse(BigDecimal.ZERO);
|
|
|
List<FileObject> fileObjects = subOrders.get(0).getPic();
|
|
List<FileObject> fileObjects = subOrders.get(0).getPic();
|
|
|
- String collectionIdSt = StringUtils.join(collectionIds, ",");
|
|
|
|
|
|
|
+ String collectionIdSt = StringUtils.join(successOrderIds, ",");
|
|
|
orderService.fixMainOrder(order, total, gas, price, fileObjects, collectionIdSt);
|
|
orderService.fixMainOrder(order, total, gas, price, fileObjects, collectionIdSt);
|
|
|
order.setSubOrders(subOrders);
|
|
order.setSubOrders(subOrders);
|
|
|
map.put("success", true);
|
|
map.put("success", true);
|