Browse Source

回调水稻

wangqifan 3 years ago
parent
commit
c6c4f8f63f
1 changed files with 4 additions and 2 deletions
  1. 4 2
      src/main/java/com/izouma/nineth/listener/CreateOrderListener.java

+ 4 - 2
src/main/java/com/izouma/nineth/listener/CreateOrderListener.java

@@ -53,6 +53,7 @@ public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
                         event.isVip(), event.getShowroomId(), event.getOrderType(), null, event
                                 .getCollectionIds(), null);
                 List<Order> subOrders = new ArrayList<>();
+                List<Long> successOrderIds = new ArrayList<>();
                 collectionIds.forEach(id -> {
                     try {
                         log.info("收到子订单创建消息: {}", event.getId());
@@ -61,9 +62,10 @@ public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
                                 event.isVip(), event.getShowroomId(), OrderType.SUB, order.getId(), null, order
                                         .getId() + Long.parseLong(id));
                         subOrders.add(subOrder);
+                        successOrderIds.add(Long.parseLong(id));
                     } catch (Exception e) {
                         log.info("创建子订单出错: {}", event.getId() + "collectionId:" + id);
-                        collectionIds.remove(id);
+//                        collectionIds.remove(id);
                     }
                 });
                 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)
                         .orElse(BigDecimal.ZERO);
                 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);
                 order.setSubOrders(subOrders);
                 map.put("success", true);