Merge branch 'v2.3.1' into 'dev'

讨论区产品

See merge request !56

community-api/src/main/java/com/tanpu/community/api/beans/qo/DiscussionAeraQo.java

@@ -28,6 +28,9 @@ public class DiscussionAeraQo {
     @ApiModelProperty(value = "是否有权限")
     private boolean hasPermission;
 
+    @ApiModelProperty(value = "是否关注")
+    private boolean hasFollow;
+
     @ApiModelProperty(value = "讨论帖")
     private List<ThemeSimpleQo> themes;
 }

community-api/src/main/java/com/tanpu/community/api/beans/req/topic/TopicDiscussionReq.java

+package com.tanpu.community.api.beans.req.topic;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TopicDiscussionReq {
+
+    @ApiModelProperty(value = "关联内容id，如课程id")
+    private String subjectId;
+
+    @ApiModelProperty(value = "关联内容类型，88基金产品 90基金管理人 300课程 323线下活动 ")
+    private Integer subjectType;
+
+    @ApiModelProperty(value = "关联内容子类型 res_type=88基金产品时有值")
+    private Integer subjectSubType;
+}

community-service/src/main/java/com/tanpu/community/controller/TopicController.java

@@ -9,6 +9,7 @@ import com.tanpu.community.api.beans.qo.TopicPageDetailQo;
 import com.tanpu.community.api.beans.qo.TopicRankQo;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.topic.FollowTopicReq;
+import com.tanpu.community.api.beans.req.topic.TopicDiscussionReq;
 import com.tanpu.community.api.beans.req.topic.TopicSearchReq;
 import com.tanpu.community.manager.TopicManager;
 import io.swagger.annotations.ApiOperation;
@@ -75,10 +76,10 @@ public class TopicController {
     }
 
 
-    @GetMapping(value = "/inner/discussion")
-    @ApiOperation("讨论区，课程(基金)介绍用")
-    public CommonResp<DiscussionAeraQo> getForum() {
-        return CommonResp.success(topicManager.getForum());
+    @GetMapping(value = "/link/discussion")
+    @ApiOperation("资源关联讨论区，课程(基金)介绍用")
+    public CommonResp<DiscussionAeraQo> getForum(@RequestBody TopicDiscussionReq req) {
+        return CommonResp.success(topicManager.getForum(req));
 
     }
 }

community-service/src/main/java/com/tanpu/community/manager/TopicManager.java

@@ -9,6 +9,7 @@ import com.tanpu.community.api.beans.qo.TopicPageDetailQo;
 import com.tanpu.community.api.beans.qo.TopicRankQo;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.topic.FollowTopicReq;
+import com.tanpu.community.api.beans.req.topic.TopicDiscussionReq;
 import com.tanpu.community.api.beans.req.topic.TopicSearchReq;
 import com.tanpu.community.api.enums.OperationTypeEnum;
 import com.tanpu.community.api.enums.TopicSpecialPermissionEnum;
@@ -167,7 +168,7 @@ public class TopicManager {
         return CommonResp.success();
     }
 
-    public DiscussionAeraQo getForum() {
+    public DiscussionAeraQo getForum(TopicDiscussionReq req) {
         return null;
     }
 }

community-service/src/main/java/com/tanpu/community/service/TopicService.java

@@ -196,7 +196,7 @@ public class TopicService {
                 } else {
                     fund = Arrays.asList(new ProductInfoVO());
                 }
-                TopicAttachment attach = TopicAttachment.builder().type(RelTypeEnum.FUND_COMPANY.type)
+                TopicAttachment attach = TopicAttachment.builder().type(RelTypeEnum.FUND.type)
                         .subType(String.valueOf(entity.getSubjectSubType()))
                         .detail(TopicAttachmentDetail.builder().fund(fund.get(0)).build()).build();
                 attachements.add(attach);