合并

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatActivityInviteLogApiService.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatActivityLogApiService.java

@@ -3,7 +3,9 @@ package com.gic.haoban.manage.api.service.chat;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
 import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
 
 import java.util.List;
 
@@ -11,7 +13,7 @@ import java.util.List;
  * @author shangfeng
  * @date 2024-10-08 14:38:18
  */
-public interface GroupChatActivityInviteLogApiService {
+public interface GroupChatActivityLogApiService {
 
     /**
      * 查询C端邀请人数据
@@ -29,4 +31,12 @@ public interface GroupChatActivityInviteLogApiService {
      */
     ServiceResponse<Page<GroupChatActivityInviteLogDTO>> queryInviteLogDetails(GroupChatActivityInviteLogQDTO inviteLogQDTO);
 
+    /**
+     * 查询奖励详情
+     *
+     * @param rewardLogQDTO
+     * @return
+     */
+    ServiceResponse<Page<GroupChatActivityRewardLogDTO>> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO);
+
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatActivityRewardLogApiService.java

-package com.gic.haoban.manage.api.service.chat;
-
-import com.gic.api.base.commons.Page;
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
-import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
-import org.springframework.stereotype.Service;
-
-/**
- * @author shangfeng
- * @date 2024-10-09 10:59:53
- */
-public interface GroupChatActivityRewardLogApiService {
-
-    /**
-     * 查询奖励详情
-     *
-     * @param rewardLogQDTO
-     * @return
-     */
-    ServiceResponse<Page<GroupChatActivityRewardLogDTO>> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO);
-}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatActivityInviteLogApiServiceImpl.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatActivityLogApiServiceImpl.java

@@ -3,12 +3,16 @@ package com.gic.haoban.manage.service.service.out.impl.chat;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
 import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
-import com.gic.haoban.manage.api.service.chat.GroupChatActivityInviteLogApiService;
+import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
+import com.gic.haoban.manage.api.service.chat.GroupChatActivityLogApiService;
 import com.gic.haoban.manage.service.service.chat.GroupChatActivityInviteLogService;
+import com.gic.haoban.manage.service.service.chat.GroupChatActivityRewardLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -16,11 +20,14 @@ import java.util.List;
  * @date 2024-10-08 14:37:46
  */
 @Service("groupChatActivityInviteLogApiService")
-public class GroupChatActivityInviteLogApiServiceImpl implements GroupChatActivityInviteLogApiService {
+public class GroupChatActivityLogApiServiceImpl implements GroupChatActivityLogApiService {
 
-    @Autowired
+    @Resource
     private GroupChatActivityInviteLogService groupChatActivityInviteLogService;
 
+    @Resource
+    private GroupChatActivityRewardLogService groupChatActivityRewardLogService;
+
     @Override
     public ServiceResponse<List<GroupChatActivityInviteLogDTO>> queryMaxBatchInviteLog(GroupChatActivityInviteLogQDTO inviteLogQDTO) {
         return ServiceResponse.success(groupChatActivityInviteLogService.queryMaxBatchInviteLog(inviteLogQDTO));
@@ -30,4 +37,10 @@ public class GroupChatActivityInviteLogApiServiceImpl implements GroupChatActivi
     public ServiceResponse<Page<GroupChatActivityInviteLogDTO>> queryInviteLogDetails(GroupChatActivityInviteLogQDTO inviteLogQDTO) {
         return ServiceResponse.success(groupChatActivityInviteLogService.queryInviteLogDetails(inviteLogQDTO));
     }
+
+
+    @Override
+    public ServiceResponse<Page<GroupChatActivityRewardLogDTO>> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO) {
+        return ServiceResponse.success(groupChatActivityRewardLogService.queryRewardLogDetails(rewardLogQDTO));
+    }
 }

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

-package com.gic.haoban.manage.service.service.out.impl.chat;
-
-import com.gic.api.base.commons.Page;
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
-import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
-import com.gic.haoban.manage.api.service.chat.GroupChatActivityRewardLogApiService;
-import com.gic.haoban.manage.service.service.chat.GroupChatActivityRewardLogService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * @author shangfeng
- * @date 2024-10-09 11:02:50
- */
-@Service("groupChatActivityRewardLogApiService")
-public class GroupChatActivityRewardLogApiServiceImpl implements GroupChatActivityRewardLogApiService {
-
-    @Resource
-    private GroupChatActivityRewardLogService groupChatActivityRewardLogService;
-
-    @Override
-    public ServiceResponse<Page<GroupChatActivityRewardLogDTO>> queryRewardLogDetails(GroupChatActivityRewardLogQDTO rewardLogQDTO) {
-        return ServiceResponse.success(groupChatActivityRewardLogService.queryRewardLogDetails(rewardLogQDTO));
-    }
-}

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -245,8 +245,6 @@
     <dubbo:reference interface="com.gic.member.ext.api.service.MemberGrowthWriteApiService" id="memberGrowthWriteApiService" timeout="10000" retries="0" check="false" />
 
     <!--  社群邀请有礼  -->
-    <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityInviteLogApiService"
+    <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityLogApiService"
                    ref="groupChatActivityInviteLogApiService" timeout="10000"/>
-    <dubbo:service interface="com.gic.haoban.manage.api.service.chat.GroupChatActivityRewardLogApiService"
-                   ref="groupChatActivityRewardLogApiService" timeout="10000"/>
 </beans>
\ No newline at end of file

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

@@ -4,8 +4,7 @@ import com.gic.haoban.manage.api.dto.chat.GroupChatActivityInviteLogDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatActivityRewardLogDTO;
 import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityInviteLogQDTO;
 import com.gic.haoban.manage.api.qdto.chat.GroupChatActivityRewardLogQDTO;
-import com.gic.haoban.manage.api.service.chat.GroupChatActivityInviteLogApiService;
-import com.gic.haoban.manage.api.service.chat.GroupChatActivityRewardLogApiService;
+import com.gic.haoban.manage.api.service.chat.GroupChatActivityLogApiService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +22,8 @@ import java.util.List;
 public class GroupChatInviteActivityTest {
 
     @Autowired
-    private GroupChatActivityInviteLogApiService groupChatActivityInviteLogApiService;
+    private GroupChatActivityLogApiService groupChatActivityLogApiService;
 
-    @Autowired
-    private GroupChatActivityRewardLogApiService groupChatActivityRewardLogApiService;
 
     @Test
     public void queryMaxBatchInviteLog(){
@@ -35,7 +32,7 @@ public class GroupChatInviteActivityTest {
         inviteLogQDTO.setChatActivityId(1L);
         inviteLogQDTO.setInviteType(1);
         inviteLogQDTO.setInviterMemberId("111");
-        ServiceResponse<List<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityInviteLogApiService.queryMaxBatchInviteLog(inviteLogQDTO);
+        ServiceResponse<List<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityLogApiService.queryMaxBatchInviteLog(inviteLogQDTO);
         System.out.println(listServiceResponse.getResult());
     }
 
@@ -47,7 +44,7 @@ public class GroupChatInviteActivityTest {
         inviteLogQDTO.setInviterMemberId("111");
         inviteLogQDTO.setSortFiled("create_time");
         inviteLogQDTO.setSortType("desc");
-        ServiceResponse<Page<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityInviteLogApiService.queryInviteLogDetails(inviteLogQDTO);
+        ServiceResponse<Page<GroupChatActivityInviteLogDTO>> listServiceResponse = groupChatActivityLogApiService.queryInviteLogDetails(inviteLogQDTO);
         System.out.println(listServiceResponse.getResult());
     }
 
@@ -57,7 +54,7 @@ public class GroupChatInviteActivityTest {
         inviteLogQDTO.setEnterpriseId("111");
         inviteLogQDTO.setChatActivityId(1L);
         inviteLogQDTO.setMemberId("111");
-        ServiceResponse<Page<GroupChatActivityRewardLogDTO>> listServiceResponse = groupChatActivityRewardLogApiService.queryRewardLogDetails(inviteLogQDTO);
+        ServiceResponse<Page<GroupChatActivityRewardLogDTO>> listServiceResponse = groupChatActivityLogApiService.queryRewardLogDetails(inviteLogQDTO);
         System.out.println(listServiceResponse.getResult());
     }