Merge branch 'feat-rsy' into 'master'

增加进群方式字段

See merge request rays/pcloud-book!186

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

@@ -18,6 +18,7 @@ import com.pcloud.book.group.biz.GroupQrcodeBiz;
 import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.dao.BookClassifyBuyRecordDao;
 import com.pcloud.book.group.dao.BookGroupClassifyDao;
+import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.BookQrcodeUserDao;
 import com.pcloud.book.group.dao.JoinGroupCipherDao;
 import com.pcloud.book.group.dao.LearningReportBrowseRecordDao;
@@ -164,6 +165,8 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
 
     @Autowired
     private BookAuthUserBiz bookAuthUserBiz;
+    @Autowired
+    private BookGroupDao bookGroupDao;
 
 
     @Override
@@ -416,6 +419,12 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     @ParamLog("获取分类基本信息")
     public ClassifyVO getClassify(Long classifyId) {
         ClassifyVO classifyVO = bookGroupClassifyDao.getClassify(classifyId);
+        if (classifyVO != null) {
+            BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(classifyVO.getBookGroupId());
+            if (bookGroupDTO != null) {
+                classifyVO.setJoinGroupType(bookGroupDTO.getJoinGroupType());
+            }
+        }
         return classifyVO;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ClassifyVO.java

@@ -54,6 +54,9 @@ public class ClassifyVO implements Serializable {
     @ApiModelProperty("创建人")
     private Long createUser;
 
+    @ApiModelProperty("进群方式：1群二维码，2客服机器人")
+    private Integer joinGroupType;
+
     public Integer getRank() {
         return rank;
     }
@@ -158,6 +161,14 @@ public class ClassifyVO implements Serializable {
         this.createUser = createUser;
     }
 
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "ClassifyVO{" +
@@ -174,6 +185,7 @@ public class ClassifyVO implements Serializable {
                 ", productSpecId=" + productSpecId +
                 ", rank=" + rank +
                 ", createUser=" + createUser +
+                ", joinGroupType=" + joinGroupType +
                 '}';
     }
 }