修改没有点击记录的bug

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/JoinGroupCipherDao.java

@@ -16,4 +16,6 @@ public interface JoinGroupCipherDao extends BaseDao<JoinGroupCipher> {
     void updateCipherStateToUsed(String cipher, String wxId);
 
     List<JoinGroupCipherDTO> getClassifyIdsByWxIdAndAltId(String wxId, String altId);
+
+    void updateQrcodeId(String cipher, String wxId, Long qrcodeId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/JoinGroupCipherDaoImpl.java

@@ -50,4 +50,13 @@ public class JoinGroupCipherDaoImpl extends BaseDaoImpl<JoinGroupCipher> impleme
         map.put("altId",altId);
         return this.getSqlSession().selectList(this.getStatement("getClassifyIdsByWxIdAndAltId"), map);
     }
+
+    @Override
+    public void updateQrcodeId(String cipher, String wxId, Long qrcodeId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("cipher",cipher);
+        map.put("wxId",wxId);
+        map.put("qrcodeId",qrcodeId);
+        this.getSqlSession().update(this.getStatement("updateQrcodeId"), map);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/JoinGroupCipherDTO.java

@@ -9,6 +9,8 @@ public class JoinGroupCipherDTO {
 
     private Long classifyId;
 
+    private Long qrcodeId;
+
     private Long wechatUserId;
 
     private String wxId;

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

@@ -17,6 +17,9 @@ public class JoinGroupCipher extends BaseEntity {
     @ApiModelProperty("分类id")
     private Long classifyId;
 
+    @ApiModelProperty("群id")
+    private Long qrcodeId;
+
     @ApiModelProperty("创建人")
     private Long wechatUserId;
 
@@ -45,6 +48,14 @@ public class JoinGroupCipher extends BaseEntity {
         this.classifyId = classifyId;
     }
 
+    public Long getQrcodeId() {
+        return qrcodeId;
+    }
+
+    public void setQrcodeId(Long qrcodeId) {
+        this.qrcodeId = qrcodeId;
+    }
+
     public Long getWechatUserId() {
         return wechatUserId;
     }
@@ -82,6 +93,7 @@ public class JoinGroupCipher extends BaseEntity {
         return "JoinGroupCipher{" +
                 "cipher='" + cipher + '\'' +
                 ", classifyId=" + classifyId +
+                ", qrcodeId=" + qrcodeId +
                 ", wechatUserId=" + wechatUserId +
                 ", wxId='" + wxId + '\'' +
                 ", hasUsed=" + hasUsed +

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookGuideBizImpl.java

@@ -14,10 +14,7 @@ import com.pcloud.book.group.dao.BookGroupClassifyDao;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
 import com.pcloud.book.group.dao.JoinGroupCipherDao;
-import com.pcloud.book.group.dto.BookGroupDTO;
-import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
-import com.pcloud.book.group.dto.JoinGroupCipherDTO;
-import com.pcloud.book.group.dto.PushAddUserMessageDTO;
+import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.entity.AppTouchRecord;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.TouchTypeEnum;
@@ -135,6 +132,11 @@ public class BookGuideBizImpl implements BookGuideBiz {
         vo1.setIp(agreeAddUserDTO.getIp());
         log.info("[同意加好友发送欢迎语 拉群] AddToGroupVO ：{}", vo1);
         WxGroupSDK.addToGroup(vo1);
+        log.info("根据群id查询群信息wxGroupId", wxGroupId);
+        GroupQrcodeDTO groupQrcodeInfo = groupQrcodeDao.getGroupQrcodeInfo(wxGroupId);
+        log.info("根据群id查询群信息groupQrcodeInfo", groupQrcodeInfo.toString());
+        log.info("更新暗号的群cipher=" + cipher + "wxId=" + agreeAddUserDTO.getUserWxId() + "qrcodeId=" + groupQrcodeInfo.getId());
+        joinGroupCipherDao.updateQrcodeId(cipher, agreeAddUserDTO.getUserWxId(), groupQrcodeInfo.getId());
     }
 
     @Override

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java

@@ -438,10 +438,12 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         final Set<Long> cIds = Sets.newHashSet();
         final Set<Long> bIds = Sets.newHashSet();
         Map<Long, Long> classifyToBookGroupMap = new HashMap<>();
+        Map<Long, Long> classifyToQrcodeMap = new HashMap<>();
         for (JoinGroupCipherDTO dto : dtos) {
             cIds.add(dto.getClassifyId());
             bIds.add(dto.getBookGroupId());
             classifyToBookGroupMap.put(dto.getClassifyId(),dto.getBookGroupId());
+            classifyToQrcodeMap.put(dto.getClassifyId(),dto.getQrcodeId());
         }
         final List<Long> classifyIds = Lists.newArrayList(cIds);
         List<ReplyKeywordDTO> replyKeywordDTOs = new ArrayList<>();
@@ -477,7 +479,7 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
                     continue;
                 }
                 AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(dto.getChannelId());
-                String linkUrl = SendWeixinRequestTools.splitUrlNew(accountSettingDto, replyKeywordDTO.getLinkUrl(), dto.getBookGroupId(), dto.getClassifyId(), null);
+                String linkUrl = SendWeixinRequestTools.splitUrlNew(accountSettingDto, replyKeywordDTO.getLinkUrl(), dto.getBookGroupId(), dto.getClassifyId(), classifyToQrcodeMap.get(dto.getClassifyId()));
                 replyKeywordDTO.setLinkUrl(linkUrl);
                 if (!StringUtil.isEmpty(linkUrl)) {
                     replyKeywordDTO.setShortLinkUrl(UrlUtils.getShortUrl4Own(linkUrl));

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

@@ -5,6 +5,7 @@
         <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="cipher" property="cipher" jdbcType="VARCHAR"/>
         <result column="classify_id" property="classifyId" jdbcType="BIGINT"/>
+        <result column="qrcode_id" property="qrcodeId" jdbcType="BIGINT"/>
         <result column="wechat_user_id" property="wechatUserId" jdbcType="BIGINT"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
@@ -14,7 +15,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, cipher, classify_id, create_time, wechat_user_id, update_time, wx_id, has_used, alt_id
+        id, cipher, classify_id, qrcode_id, create_time, wechat_user_id, update_time, wx_id, has_used, alt_id
     </sql>
 
     <insert id="insert" parameterType="com.pcloud.book.group.entity.JoinGroupCipher" useGeneratedKeys="true"
@@ -23,6 +24,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             cipher,
             classify_id,
+            qrcode_id,
             create_time,
             wechat_user_id,
             has_used,
@@ -31,6 +33,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{cipher,jdbcType=VARCHAR},
             #{classifyId,jdbcType=BIGINT},
+            #{qrcodeId,jdbcType=BIGINT},
             now(),
             #{wechatUserId,jdbcType=BIGINT},
             0,
@@ -54,7 +57,7 @@
     <!--根据暗号获取包含bookGroupId-->
     <select id="getDTOByCipher" parameterType="String" resultType="com.pcloud.book.group.dto.JoinGroupCipherDTO">
         select
-            a.id, cipher, a.classify_id as classifyId, a.wechat_user_id as wechatUserId, a.wx_id as wxId,
+            a.id, cipher, a.classify_id as classifyId, a.qrcode_id qrcodeId, a.wechat_user_id as wechatUserId, a.wx_id as wxId,
             a.has_used as hasUsed, b.book_group_id as bookGroupId
         from join_group_cipher a left join book_group_classify b on a.classify_id = b.id
         where a.cipher=#{cipher} limit 1
@@ -71,10 +74,18 @@
 
     <!--根据微信id和机器人id获取分类集合-->
     <select id="getClassifyIdsByWxIdAndAltId" parameterType="map" resultType="com.pcloud.book.group.dto.JoinGroupCipherDTO">
-        select a.classify_id as classifyId, b.book_group_id as bookGroupId from join_group_cipher a
+        select a.classify_id as classifyId, a.qrcode_id qrcodeId, b.book_group_id as bookGroupId from join_group_cipher a
         left join book_group_classify b on a.classify_id = b.id where
         a.has_used=1
         and a.alt_id=#{altId}
         and a.wx_id=#{wxId}
     </select>
+
+    <!--更新二维码-->
+    <update id="updateQrcodeId" parameterType="map">
+        update join_group_cipher set
+        qrcode_id=#{qrcodeId}
+        where cipher=#{cipher}
+        and wx_id=#{wxId}
+    </update>
 </mapper>
\ No newline at end of file