Merge branch 'dev' into 'release'

feat(可回溯): 回溯保存

See merge request wanghao/afis-recall!2
This commit is contained in:
wanghao
2023-05-18 03:32:36 +00:00
@@ -70,13 +70,13 @@ public class RecallRecordApiServiceImpl implements RecallRecordApiService {
})); }));
if (isLastEvent && !"1".equals(order.getComplete())) { if (isLastEvent && !"1".equals(order.getComplete())) {
order.setComplete("1"); order.setComplete("1");
Optional.ofNullable(record.getOrderId())
.ifPresent(order::setOrderId);
order.setCompleteDate(System.currentTimeMillis()); order.setCompleteDate(System.currentTimeMillis());
order.setUpdateTime(System.currentTimeMillis()); order.setUpdateTime(System.currentTimeMillis());
recallOrderService.updateRecallOrderById(order); recallOrderService.updateRecallOrderById(order);
} }
record.setTraceId(traceId); record.setTraceId(traceId);
Optional.ofNullable(record.getOrderId())
.ifPresent(record::setOrderId);
RecallRecordEntity recallRecord = new RecallRecordEntity(); RecallRecordEntity recallRecord = new RecallRecordEntity();
BeanUtils.copyProperties(record, recallRecord); BeanUtils.copyProperties(record, recallRecord);
recallRecord.setId(UUID.randomUUID().toString().replace("-", "")); recallRecord.setId(UUID.randomUUID().toString().replace("-", ""));