feat:[1003719]自建码规则更新

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

@@ -561,15 +561,21 @@ public class BookGroupBizImpl implements BookGroupBiz {
             bookGroup.setGroupQrcodeUrl(groupQrcodeVO.getQrcodeUrl());
             bookGroup.setSceneId(groupQrcodeVO.getSceneId());
             bookGroupDao.insert(bookGroup);
+            BookGroup group = new BookGroup();
+            group.setId(bookGroup.getId());
+            group.setGroupQrcodeLink(this.getGroupQrcodeLink(bookGroup.getId(), adviserId));
             if (joinGroupType != null) {
-                bookGroupDao.updateJoinGroupType(bookGroup.getId(), joinGroupType);
+                group.setJoinGroupType(joinGroupType);
             }
+            bookGroupDao.update(group);
         } else {
             bookGroupDao.insert(bookGroup);
-            String groupQrcodeUrl = QrcodeUtils.createWithMargin(bookGroupQrcodeDomain + "/" + bookGroup.getId(), 1);
+            String groupQrcodeLink = this.getGroupQrcodeLink(bookGroup.getId(), adviserId);
+            String groupQrcodeUrl = QrcodeUtils.createWithMargin(groupQrcodeLink, 1);
             BookGroup group = new BookGroup();
             group.setId(bookGroup.getId());
             group.setGroupQrcodeUrl(groupQrcodeUrl);
+            group.setGroupQrcodeLink(groupQrcodeLink);
             if (joinGroupType != null) {
                 group.setJoinGroupType(joinGroupType);
             }
@@ -753,6 +759,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 }
                 group.setSceneId(groupQrcodeVO.getSceneId());
                 group.setGroupQrcodeUrl(groupQrcodeVO.getQrcodeUrl());
+                group.setGroupQrcodeLink(this.getGroupQrcodeLink(bookGroupDTO.getId(), adviserId));
                 bookGroupDao.update(group);
                 // 展示返回最新生成的
                 bookGroupDTO.setGroupQrcodeUrl(groupQrcodeVO.getQrcodeUrl());
@@ -765,8 +772,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
                     final Boolean haveQrcode = this.isHaveQrcode(bookId, channelId, adviserId);
                     // 如果之前是公众号二维码则要重新生成自有码
                     if (!haveQrcode) {
-                        String groupQrcodeUrl = QrcodeUtils.createWithMargin(bookGroupQrcodeDomain + "/" + bookGroupDTO.getId(), 1);
+                        String groupQrcodeLink = this.getGroupQrcodeLink(bookGroupDTO.getId(), adviserId);
+                        String groupQrcodeUrl = QrcodeUtils.createWithMargin(groupQrcodeLink, 1);
                         group.setGroupQrcodeUrl(groupQrcodeUrl);
+                        group.setGroupQrcodeLink(groupQrcodeLink);
                         // 展示返回最新生成的
                         bookGroupDTO.setGroupQrcodeUrl(groupQrcodeUrl);
                     }
@@ -811,6 +820,21 @@ public class BookGroupBizImpl implements BookGroupBiz {
         return bookGroupDTO;
     }
 
+    /**
+     * 社群码链接
+     * @author：zhuyajie
+     * @date：2020/10/12 14:26
+        自建码规则更新
+        https://qrcode.5rs.me/t-1/agentId/[sceneId|bookGroupId]
+        t-1，自建码，sceneId
+        t-2，社群码，bookGroupId
+     */
+    private String getGroupQrcodeLink(Long bookGroupId, Long adviserId) {
+        Long agentId = adviserConsr.getAgentIdByAdviser(adviserId);
+        String url = bookGroupQrcodeDomain + "/t-2/" + agentId + "/" + bookGroupId;
+        return url;
+    }
+
     @ParamLog("获取好友引导语信息")
     public List<BookGroupFriendGuide> getFriendGuideList( Long bookGroupId ) {
         List<BookGroupFriendGuide> friendGuides = bookGroupFriendGuideDao.getListByBookGroupId(bookGroupId);
@@ -1069,7 +1093,6 @@ public class BookGroupBizImpl implements BookGroupBiz {
         for (Object object : pageBean.getRecordList()) {
             BookDto bookDto = (BookDto) object;
             Long bookGroupId = bookDto.getBookGroupId();
-            bookDto.setGroupQrcodeLink(bookGroupQrcodeDomain + "/" + bookGroupId);
             bookDto.setBookName(null != bookDto.getBookName() ? StringUtil.addBracket(bookDto.getBookName()) : null);
             if (!MapUtils.isEmpty(statisMap) && statisMap.containsKey(bookGroupId)) {
                 BookGroupStatisticDTO dto = statisMap.get(bookGroupId);
@@ -1099,7 +1122,6 @@ public class BookGroupBizImpl implements BookGroupBiz {
             bookDto.setHasRobotKeyword(hasRobotKeyword);
             if (!MapUtils.isEmpty(relatedBookGroupMap) && relatedBookGroupMap.containsKey(bookDto.getRelatedBookGroupId())) {
                 BookGroupDTO relatedBookGroup = relatedBookGroupMap.get(bookDto.getRelatedBookGroupId());
-                relatedBookGroup.setGroupQrcodeLink(bookGroupQrcodeDomain + "/" + bookDto.getRelatedBookGroupId());
                 bookDto.setRelatedBookGroup(relatedBookGroup);
             }
         }
@@ -1221,7 +1243,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
         if (bookGroupDTO != null) {
             BookAppletScene byBookGroupId = bookAppletSceneDao.getByBookGroupId(bookGroupDTO.getId());
             bookGroupDTO.setAppletUrl(byBookGroupId == null ? "" : byBookGroupId.getAppletUrl());
-            bookGroupDTO.setUrl(bookGroupQrcodeDomain + "/" + bookGroupDTO.getId());
+            bookGroupDTO.setUrl(bookGroupDTO.getGroupQrcodeLink());
             bookGroupDTO.setAppletId(byBookGroupId == null ? "" : byBookGroupId.getAppletId());
         }
         return bookGroupDTO;
@@ -5604,12 +5626,9 @@ public class BookGroupBizImpl implements BookGroupBiz {
         }
         for (Object object : pageBean.getRecordList()) {
             BookDto bookDto = (BookDto) object;
-            Long bookGroupId = bookDto.getBookGroupId();
-            bookDto.setGroupQrcodeLink(bookGroupQrcodeDomain + "/" + bookGroupId);
             bookDto.setBookName(null != bookDto.getBookName() ? StringUtil.addBracket(bookDto.getBookName()) : null);
             if (!MapUtils.isEmpty(relatedBookGroupMap) && relatedBookGroupMap.containsKey(bookDto.getRelatedBookGroupId())) {
                 BookGroupDTO relatedBookGroup = relatedBookGroupMap.get(bookDto.getRelatedBookGroupId());
-                relatedBookGroup.setGroupQrcodeLink(bookGroupQrcodeDomain + "/" + bookDto.getRelatedBookGroupId());
                 bookDto.setRelatedBookGroup(relatedBookGroup);
             }
             if (!MapUtils.isEmpty(adviserMap) && adviserMap.containsKey(bookDto.getAdviserId())){

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/BookGroup.java

@@ -180,6 +180,19 @@ public class BookGroup extends BaseEntity {
     private Integer groupQrcodeLocationId;
     private String groupQrcodeRemark;
 
+    /**
+     * 社群码链接
+     */
+    private String groupQrcodeLink;
+
+    public String getGroupQrcodeLink() {
+        return groupQrcodeLink;
+    }
+
+    public void setGroupQrcodeLink(String groupQrcodeLink) {
+        this.groupQrcodeLink = groupQrcodeLink;
+    }
+
     public Long getRelatedBookGroupId() {
         return relatedBookGroupId;
     }
@@ -483,7 +496,14 @@ public class BookGroup extends BaseEntity {
                 ", agentId=" + agentId +
                 ", belongSpecialAgent=" + belongSpecialAgent +
                 ", shortBookName='" + shortBookName + '\'' +
+                ", singleGroup=" + singleGroup +
+                ", relatedBookGroupId=" + relatedBookGroupId +
                 ", friendGuideList=" + friendGuideList +
+                ", openWeapp=" + openWeapp +
+                ", groupQrcodePageNum=" + groupQrcodePageNum +
+                ", groupQrcodeLocationId=" + groupQrcodeLocationId +
+                ", groupQrcodeRemark='" + groupQrcodeRemark + '\'' +
+                ", groupQrcodeLink='" + groupQrcodeLink + '\'' +
                 '}';
     }
 }
\ No newline at end of file

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

@@ -603,7 +603,8 @@
 			WHEN 2 THEN bgs.id
 			WHEN 3 THEN srk.id
 			WHEN 4 THEN bgs.id
-			else null END,0)=0,0,1)as has_serve, A.IS_PRINT isPrint, G.open_weapp openWeapp, G.single_group singleGroup, G.related_book_group_id relatedBookGroupId
+			else null END,0)=0,0,1)as has_serve, A.IS_PRINT isPrint, G.open_weapp openWeapp,
+			G.single_group singleGroup, G.related_book_group_id relatedBookGroupId, G.group_qrcode_link groupQrcodeLink
 		FROM
             book_group G
         LEFT JOIN BOOK_ADVISER A ON G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID
@@ -2492,7 +2493,7 @@
 		A.TEMPLET_ID, A.BOOK_ADVISER_ID, CONCAT('BK',A.BOOK_ID) uniqueNumber,
 		G.update_time LAST_MODIFIED_DATE, G.create_time CREATED_DATE, G.id BOOK_GROUP_ID, G.group_qrcode_url groupQrcodeUrl,
 		G.group_qrcode_name groupQrcodeName, G.dep_label_id bookGroupDepLabelId, G.join_group_type,
-		G.related_book_group_id relatedBookGroupId, A.IS_PRINT isPrint
+		G.related_book_group_id relatedBookGroupId, A.IS_PRINT isPrint, G.group_qrcode_link groupQrcodeLink
 		FROM
 		book_group G
 		INNER JOIN BOOK_ADVISER A ON G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID

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

@@ -35,6 +35,7 @@
         <result column="related_book_group_id" property="relatedBookGroupId" jdbcType="BIGINT"/>
         <result column="group_qrcode_location_id" property="groupQrcodeLocationId" jdbcType="BIGINT"/>
         <result column="group_qrcode_remark" property="groupQrcodeRemark" jdbcType="VARCHAR"/>
+        <result column="group_qrcode_link" property="groupQrcodeLink" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="BookGroupDTO" type="com.pcloud.book.group.dto.BookGroupDTO">
@@ -76,6 +77,7 @@
         <result column="group_qrcode_page_num" property="groupQrcodePageNum" jdbcType="INTEGER"/>
         <result column="group_qrcode_location_id" property="groupQrcodeLocationId" jdbcType="BIGINT"/>
         <result column="group_qrcode_remark" property="groupQrcodeRemark" jdbcType="VARCHAR"/>
+        <result column="group_qrcode_link" property="groupQrcodeLink" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -84,7 +86,8 @@
         create_time,
         update_time, is_delete, is_show_book_name,join_group_type,add_friend_guide,customer_service_name,
         is_invite_group,book_group_cipher, last_push_update_time, is_some_update, agent_id, belong_special_agent,
-        short_book_name, open_weapp, single_group, related_book_group_id,group_qrcode_page_num,group_qrcode_location_id,group_qrcode_remark
+        short_book_name, open_weapp, single_group, related_book_group_id,group_qrcode_page_num,group_qrcode_location_id,group_qrcode_remark,
+        group_qrcode_link
     </sql>
 
     <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -263,6 +266,7 @@
             last_push_update_time,
             is_some_update,
             agent_id,
+            group_qrcode_link,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{bookId,jdbcType=BIGINT},
@@ -288,6 +292,7 @@
             #{lastPushUpdateTime,jdbcType=TIMESTAMP},
             #{isSomeUpdate,jdbcType=BOOLEAN},
             #{agentId,jdbcType=BIGINT},
+            #{groupQrcodeLink},
         </trim>
     </insert>
 
@@ -373,6 +378,9 @@
             <if test="groupQrcodeRemark !=null">
                 group_qrcode_remark = #{groupQrcodeRemark},
             </if>
+            <if test="groupQrcodeLink != null">
+                group_qrcode_link = #{groupQrcodeLink},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>