社群邀请明细

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

@@ -51,6 +51,8 @@ public class GroupChatActivityRewardLogServiceImpl implements GroupChatActivityR
         if (CollectionUtils.isEmpty(rewardLogList)) {
             return PageHelperUtils.changePageHelperToCurrentPage(rewardLogList, GroupChatActivityRewardLogDTO.class);
         }
+        Page<GroupChatActivityRewardLogDTO> page = PageHelperUtils.changePageHelperToCurrentPage(rewardLogList, GroupChatActivityRewardLogDTO.class);
+
         List<Long> rewardLogIdList = rewardLogList.stream()
                 .map(TabGroupChatActivityRewardLog::getChatActivityRewardLogId).collect(Collectors.toList());
         GroupChatActivityRewardDetailLogQDTO rewardDetailLogQDTO = new GroupChatActivityRewardDetailLogQDTO();
@@ -69,7 +71,7 @@ public class GroupChatActivityRewardLogServiceImpl implements GroupChatActivityR
             return rewardLogDTO;
 
         }).collect(Collectors.toList());
-
-        return PageHelperUtils.changePageHelperToCurrentPage(rewardLogDTOList, GroupChatActivityRewardLogDTO.class);
+        page.setResult(rewardLogDTOList);
+        return page;
     }
 }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatActivityRewardLogMapper.xml

@@ -15,7 +15,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        chat_activity_reward_id
+        chat_activity_reward_log_id
         , chat_activity_id,
             member_id, reward_invite, invite_level,
         enterprise_id, wx_enterprise_id,
@@ -169,7 +169,7 @@
         <if test="beginTime != null">
             and create_time gt #{beginTime}
         </if>
-        <if test="inviteType != null">
+        <if test="endTime != null">
             and create_time lt #{endTime}
         </if>
         order by create_time desc

haoban-manage3-service/src/test/java/GroupChatInviteActivityTest.java

@@ -28,10 +28,10 @@ public class GroupChatInviteActivityTest {
     @Test
     public void queryMaxBatchInviteLog(){
         GroupChatActivityInviteLogQDTO inviteLogQDTO = new GroupChatActivityInviteLogQDTO();
-        inviteLogQDTO.setEnterpriseId("111");
-        inviteLogQDTO.setChatActivityId(1L);
-        inviteLogQDTO.setInviteType(1);
-        inviteLogQDTO.setInviterMemberId("111");
+        inviteLogQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+        inviteLogQDTO.setChatActivityId(716721754221821953L);
+//        inviteLogQDTO.setInviteType(1);
+        inviteLogQDTO.setInviterMemberId("ff808081906def5201907645bfc7005a");
         ServiceResponse<List<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityLogApiService.queryMaxBatchInviteLog(inviteLogQDTO);
         System.out.println(listServiceResponse.getResult());
     }
@@ -39,9 +39,9 @@ public class GroupChatInviteActivityTest {
     @Test
     public void queryInviteLogDetails(){
         GroupChatActivityInviteLogQDTO inviteLogQDTO = new GroupChatActivityInviteLogQDTO();
-        inviteLogQDTO.setEnterpriseId("111");
-        inviteLogQDTO.setChatActivityId(1L);
-        inviteLogQDTO.setInviterMemberId("111");
+        inviteLogQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+        inviteLogQDTO.setChatActivityId(716721754221821953L);
+        inviteLogQDTO.setInviterMemberId("ff808081906def5201907645bfc7005a");
         inviteLogQDTO.setSortFiled("create_time");
         inviteLogQDTO.setSortType("desc");
         ServiceResponse<Page<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityLogApiService.queryInviteLogDetails(inviteLogQDTO);
@@ -51,9 +51,9 @@ public class GroupChatInviteActivityTest {
     @Test
     public void queryRewardLogDetails(){
         GroupChatActivityRewardLogQDTO inviteLogQDTO = new GroupChatActivityRewardLogQDTO();
-        inviteLogQDTO.setEnterpriseId("111");
-        inviteLogQDTO.setChatActivityId(1L);
-        inviteLogQDTO.setMemberId("111");
+        inviteLogQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+        inviteLogQDTO.setChatActivityId(716721754221821953L);
+        inviteLogQDTO.setMemberId("ff808081906def5201907645bfc7005a");
         ServiceResponse<Page<GroupChatActivityRewardLogDTO>> listServiceResponse = groupChatActivityLogApiService.queryRewardLogDetails(inviteLogQDTO);
         System.out.println(listServiceResponse.getResult());
     }