Merge branch 'dev' into 'release'

feat(可回溯): 回溯保存 See merge request wanghao/afis-recall!2
2023-05-18 03:32:36 +00:00
parent 690cc8ac34 57e1415de3
commit 23ba4f41e4
1 changed files with 2 additions and 2 deletions
@@ -70,13 +70,13 @@ public class RecallRecordApiServiceImpl implements RecallRecordApiService {
                }));
        if (isLastEvent && !"1".equals(order.getComplete())) {
            order.setComplete("1");
+            Optional.ofNullable(record.getOrderId())
+                    .ifPresent(order::setOrderId);
            order.setCompleteDate(System.currentTimeMillis());
            order.setUpdateTime(System.currentTimeMillis());
            recallOrderService.updateRecallOrderById(order);
        }
        record.setTraceId(traceId);
-        Optional.ofNullable(record.getOrderId())
-                .ifPresent(record::setOrderId);
        RecallRecordEntity recallRecord = new RecallRecordEntity();
        BeanUtils.copyProperties(record, recallRecord);
        recallRecord.setId(UUID.randomUUID().toString().replace("-", ""));