|
@@ -170,17 +170,17 @@ public class ContactHelpLogService {
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
|
|
Map<String, Object> result = new LinkedHashMap<>();
|
|
Map<String, Object> result = new LinkedHashMap<>();
|
|
|
- result.put("contact", Map.of(
|
|
|
|
|
- "id", contact.getId(),
|
|
|
|
|
- "name", contact.getName(),
|
|
|
|
|
- "avatar", contact.getAvatar(),
|
|
|
|
|
- "relationshipType", contact.getRelationshipType()
|
|
|
|
|
- ));
|
|
|
|
|
- result.put("summary", Map.of(
|
|
|
|
|
- "helpCount", totalCount,
|
|
|
|
|
- "totalAmount", totalAmount,
|
|
|
|
|
- "lastHelpedAt", logs.isEmpty() ? null : logs.get(0).getHappenedAt()
|
|
|
|
|
- ));
|
|
|
|
|
|
|
+ Map<String, Object> contactMap = new HashMap<>();
|
|
|
|
|
+ contactMap.put("id", contact.getId());
|
|
|
|
|
+ contactMap.put("name", contact.getName());
|
|
|
|
|
+ contactMap.put("avatar", contact.getAvatar());
|
|
|
|
|
+ contactMap.put("relationshipType", contact.getRelationshipType());
|
|
|
|
|
+ result.put("contact", contactMap);
|
|
|
|
|
+ Map<String, Object> summaryMap = new HashMap<>();
|
|
|
|
|
+ summaryMap.put("helpCount", totalCount);
|
|
|
|
|
+ summaryMap.put("totalAmount", totalAmount);
|
|
|
|
|
+ summaryMap.put("lastHelpedAt", logs.isEmpty() ? null : logs.get(0).getHappenedAt());
|
|
|
|
|
+ result.put("summary", summaryMap);
|
|
|
result.put("records", logs);
|
|
result.put("records", logs);
|
|
|
return Result.success(result);
|
|
return Result.success(result);
|
|
|
}
|
|
}
|