加字段

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

@@ -1293,21 +1293,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
         ownAltQrcodeInfoDTO.setAltQrcodeUrl(selfRobotDTO.getQrcodeUrl());
         ownAltQrcodeInfoDTO.setAltHeadUrl(selfRobotDTO.getHeadPic());
         //获取之前是否有没有使用的暗号
-        JoinGroupCipher joinGroupCipher = joinGroupCipherDao.getByWechatUserIdAndQrcodeId(wechatUserId, qrcodeId);
+        JoinGroupCipher joinGroupCipher = joinGroupCipherDao.getByWechatUserIdAndQrcodeId(wechatUserId, qrcodeId, CipherTypeEnum.QRCODE_CIPHER.code);
         String cipher;
         if (joinGroupCipher != null) {
             cipher = joinGroupCipher.getCipher();
-            //避免之前通过社群码入群
-            if (!CipherTypeEnum.QRCODE_CIPHER.code.equals(joinGroupCipher.getType())){
-                cipher = UUIDUitl.generateShort();
-                //查重，如果有重复，再次生成
-                JoinGroupCipher joinGroupCipherHas = joinGroupCipherDao.getByCipher(cipher);
-                if (joinGroupCipherHas != null) {
-                    cipher = UUIDUitl.generateShort();
-                }
-                //更新
-                joinGroupCipherDao.updateCipher(joinGroupCipher.getId(), cipher);
-            }
         } else {
             //新增暗号
             cipher = UUIDUitl.generateShort();

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

@@ -28,7 +28,7 @@ public interface JoinGroupCipherDao extends BaseDao<JoinGroupCipher> {
      */
     BigDecimal getPayPrice(String wxId, Long qrcodeId);
 
-    JoinGroupCipher getByWechatUserIdAndQrcodeId(Long wechatUserId, Long qrcodeId);
+    JoinGroupCipher getByWechatUserIdAndQrcodeId(Long wechatUserId, Long qrcodeId, Integer type);
 
     void updateCipher(Long id, String cipher);
 }

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

@@ -71,10 +71,11 @@ public class JoinGroupCipherDaoImpl extends BaseDaoImpl<JoinGroupCipher> impleme
     }
 
     @Override
-    public JoinGroupCipher getByWechatUserIdAndQrcodeId(Long wechatUserId, Long qrcodeId) {
+    public JoinGroupCipher getByWechatUserIdAndQrcodeId(Long wechatUserId, Long qrcodeId, Integer type) {
         Map<String,Object> map=new HashMap<>();
         map.put("wechatUserId",wechatUserId);
         map.put("qrcodeId",qrcodeId);
+        map.put("type",type);
         return this.getSqlSession().selectOne(this.getStatement("getByWechatUserIdAndQrcodeId"), map);
     }
 

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

@@ -109,7 +109,8 @@
     <select id="getByWechatUserIdAndQrcodeId" parameterType="map" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"/> from join_group_cipher
         where wechat_user_id=#{wechatUserId} and
-        qrcode_id=#{qrcode_id}
+        qrcode_id=#{qrcodeId} and
+        type=#{type} limit 1
     </select>
 
     <!--更新暗号-->