Merge branch 'fixbug/1025516' into 'master'

bug: [1025516] 书籍相关社群里活码群应该显示群分类的名称

See merge request rays/pcloud-book!959

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -1490,6 +1490,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     if (groupActivity4AppletDTO != null) {
                         item.setGroupName(groupActivity4AppletDTO.getName());
                         item.setGroupDesc(groupActivity4AppletDTO.getCutDesc());
+                        item.setPrice(groupActivity4AppletDTO.getPrice());
                         if (StringUtil.isEmpty(item.getGroupType())){ //add by pans 编辑段群groupType来源于rightNowItem
                             item.setGroupType(groupActivity4AppletDTO.getGroupType() == null ? null :groupActivity4AppletDTO.getGroupType().toString());
                             item.setLinkUrl(groupActivity4AppletDTO.getGroupLink());

pcloud-service-book/src/main/resources/mapper/group/GroupQrcode.Mapper.xml

@@ -881,7 +881,7 @@
         r.id id,
         r.classify_id classifyId,
         r.weixin_group_id weixinGroupId,
-        r.group_name groupName,
+        f.classify groupName,
         r.user_number userNumber,
         f.classify classify,
         r.qrcode_url qrcodeUrl,

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -331,6 +331,7 @@
         c.id,
         c.classify as `name`,
         c.classify_introduce AS `desc`,
+        c.price AS price,
         a.join_type AS joinType,
         c.classify AS groupName,
         b.user_number userNumber,
@@ -366,6 +367,7 @@
         a.description as `desc`,
         a.join_type AS joinType,
         c.classify AS groupName,
+        c.price AS price,
         b.user_number userNumber,
         b.classify_id classifyId,
         c.book_group_id bookGroupId,
@@ -706,6 +708,7 @@
     c.id,
     c.classify as `name`,
     c.classify_introduce AS `desc`,
+    c.price AS price,
     c.classify AS groupName,
     b.user_number userNumber,
     b.classify_id classifyId,