合并代码

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

@@ -249,6 +249,7 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
             }
             weixinQrcode.setUpdateState(0);
         }else {
+            weixinQrcode.setWeixinGroupId("");
             weixinQrcode.setUpdateState(4);
             newUrl = QrcodeTools.reCreateQrcode(weixinQrcodeVO.getQrcodeUrl());
         }

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

@@ -34,7 +34,7 @@
     <select id="getOneWechatGroup" resultType = "WeixinQrcodeDTO" >
         SELECT id, qrcode_url qrcodeUrl, weixin_group_id weixinGroupId, robot_id robotId, robot_wx_id robotWxId
         FROM weixin_qrcode
-        WHERE use_state = 0  AND update_state not in (2,4)
+        WHERE use_state = 0  AND update_state in (0,1,3)
         LIMIT 1
     </select>