From c4bf41ba7be2f9c70c0f3811ee680c9e0fe198c5 Mon Sep 17 00:00:00 2001 From: BrandWang Date: Mon, 27 Mar 2023 15:27:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E5=8F=AF?= =?UTF-8?q?=E5=9B=9E=E6=BA=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整返回逻辑 不返回events数据 --- .../recall/web/RecallController.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) 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)); }); }