diff --git a/src/main/java/com/wabestway/recall/web/RecallController.java b/src/main/java/com/wabestway/recall/web/RecallController.java index 99d2550..2328bd3 100644 --- a/src/main/java/com/wabestway/recall/web/RecallController.java +++ b/src/main/java/com/wabestway/recall/web/RecallController.java @@ -67,26 +67,27 @@ public class RecallController { }); } }); - } - if (record.getTraceId() == null || record.getTraceId().isEmpty()) { - record.setTraceId(UUID.randomUUID().toString().replace("-", "")); - Order order = new Order(); - order.setTraceId(record.getTraceId()); - order.setProductCode(record.getProductCode()); - order.setProductName(record.getProductName()); - order.setCreateAt(System.currentTimeMillis()); - order.setAppKey(record.getAppKey()); - order.setArchived("0"); - order.setComplete("0"); - if (record.isLast()) { - order.setComplete("1"); + } else { + if (record.getTraceId() == null || record.getTraceId().isEmpty()) { + record.setTraceId(UUID.randomUUID().toString().replace("-", "")); + Order order = new Order(); + order.setTraceId(record.getTraceId()); + order.setProductCode(record.getProductCode()); + order.setProductName(record.getProductName()); + order.setCreateAt(System.currentTimeMillis()); + order.setAppKey(record.getAppKey()); + order.setArchived("0"); + order.setComplete("0"); + if (record.isLast()) { + order.setComplete("1"); + } + orderRepository.save(order).subscribe(); } - orderRepository.save(order).subscribe(); } - record.setCreateAt(System.currentTimeMillis()); return recordRepository.save(record).flatMap(ss -> { + ss.setEvents(null); return Mono.just(ResObj.ok(ss)); }); }