修改字段

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatActivityRewardLogDTO.java

@@ -15,7 +15,7 @@ public class GroupChatActivityRewardLogDTO implements Serializable {
     /**
      * 社群活动奖励id
      */
-    private Long chatActivityRewardId;
+    private Long chatActivityRewardLogId;
 
     /**
      * 社群活动id
@@ -53,12 +53,12 @@ public class GroupChatActivityRewardLogDTO implements Serializable {
 
     private List<GroupChatActivityRewardDetailLogDTO> rewardDetailLogDTOList;
 
-    public Long getChatActivityRewardId() {
-        return chatActivityRewardId;
+    public Long getChatActivityRewardLogId() {
+        return chatActivityRewardLogId;
     }
 
-    public void setChatActivityRewardId(Long chatActivityRewardId) {
-        this.chatActivityRewardId = chatActivityRewardId;
+    public void setChatActivityRewardLogId(Long chatActivityRewardLogId) {
+        this.chatActivityRewardLogId = chatActivityRewardLogId;
     }
 
     public Long getChatActivityId() {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatActivityRewardLogServiceImpl.java

@@ -52,7 +52,7 @@ public class GroupChatActivityRewardLogServiceImpl implements GroupChatActivityR
             return PageHelperUtils.changePageHelperToCurrentPage(rewardLogList, GroupChatActivityRewardLogDTO.class);
         }
         List<Long> rewardLogIdList = rewardLogList.stream()
-                .map(TabGroupChatActivityRewardLog::getChatActivityRewardId).collect(Collectors.toList());
+                .map(TabGroupChatActivityRewardLog::getChatActivityRewardLogId).collect(Collectors.toList());
         GroupChatActivityRewardDetailLogQDTO rewardDetailLogQDTO = new GroupChatActivityRewardDetailLogQDTO();
         rewardDetailLogQDTO.setRewardLogIdList(rewardLogIdList);
         List<GroupChatActivityRewardDetailLogDTO> rewardDetailLogDTOList = groupChatActivityRewardDetailLogService.queryList(rewardDetailLogQDTO);
@@ -65,7 +65,7 @@ public class GroupChatActivityRewardLogServiceImpl implements GroupChatActivityR
 
         List<GroupChatActivityRewardLogDTO> rewardLogDTOList = rewardLogList.stream().map(tabGroupChatActivityRewardLog -> {
             GroupChatActivityRewardLogDTO rewardLogDTO = convertToDTO(tabGroupChatActivityRewardLog);
-            rewardLogDTO.setRewardDetailLogDTOList(finalRewardDetailLogDTOMap.get(rewardLogDTO.getChatActivityRewardId()));
+            rewardLogDTO.setRewardDetailLogDTOList(finalRewardDetailLogDTOMap.get(rewardLogDTO.getChatActivityRewardLogId()));
             return rewardLogDTO;
 
         }).collect(Collectors.toList());