欢迎语修改

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

@@ -178,11 +178,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
         //如果人数超过限制，重新分配群
         if (memberCount >= groupQrcodeDTO.getChangeNumber() && QrcodeStatusEnum.ON_USE.value.equals(groupQrcodeDTO.getQrcodeState())) {
             //修改状态，重新分配一个群
-            Boolean isAddWechatGroup = addWechatGroup(groupQrcodeDTO.getClassifyId());
-            if (isAddWechatGroup) {
-                //将二维码改为已满群状态
-                groupQrcodeDao.changeQrcodeState(groupQrcodeDTO.getWeixinQrcodeId(), QrcodeStatusEnum.OVER_NUMBER.value);
-            }
+            addWechatGroup(groupQrcodeDTO.getClassifyId(), groupQrcodeDTO.getWeixinQrcodeId());
         }
         if (memberCount >= 100 && QrcodeStatusEnum.ON_USE.value.equals(groupQrcodeDTO.getUseState())) {
             //将二维码修改为已满群状态
@@ -215,11 +211,13 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     /**
      * 重新分配一个群
      */
-    private Boolean addWechatGroup(Long classifyId) {
+    @Transactional(rollbackFor = Exception.class)
+    public void addWechatGroup(Long classifyId, Long weixinQrcodeId) {
         WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode();
-        if (oneQrcode == null) {
-            return false;
-        }
+        if (oneQrcode != null) {
+            //将二维码改为已满群状态
+            Integer number = groupQrcodeDao.changeQrcodeState(weixinQrcodeId, QrcodeStatusEnum.OVER_NUMBER.value);
+            if (number > 0){
                 //获取标签对应基本信息
                 GroupNameAndMaxSeqDTO groupNameAndMaxSeqDTO = bookGroupClassifyBiz.getGroupNameAndMaxSeq(classifyId);
                 if (groupNameAndMaxSeqDTO != null) {
@@ -238,9 +236,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
                     this.insert(groupQrcode);
                     String robotId = wechatGroupConsr.getRobotIdByGroupId(oneQrcode.getWeixinGroupId());
                     SendWeixinRequestTools.changeGroupName(robotId, oneQrcode.getWeixinGroupId(), groupName);
-            return true;
-        } else {
-            return false;
+                }
+            }
         }
     }
 

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

@@ -86,7 +86,7 @@ public interface GroupQrcodeDao extends BaseDao<GroupQrcode> {
      * @Desr:修改二维码状态
      * @Date:2019/4/28 17:20
      */
-    void changeQrcodeState(Long id, Integer qrcode_state);
+    Integer changeQrcodeState(Long id, Integer qrcode_state);
 
     /**
      * @Author:lili

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

@@ -83,11 +83,11 @@ public class GroupQrcodeDaoImpl extends BaseDaoImpl<GroupQrcode> implements Grou
     }
 
     @Override
-    public void changeQrcodeState(Long id, Integer qrcodeState) {
+    public Integer changeQrcodeState(Long id, Integer qrcodeState) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("id", id);
         paramMap.put("qrcodeState", qrcodeState);
-        this.getSqlSession().update(this.getStatement("changeQrcodeState"), paramMap);
+        return this.getSqlSession().update(this.getStatement("changeQrcodeState"), paramMap);
     }
 
     @Override

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/SendWeixinRequestTools.java

@@ -283,9 +283,9 @@ public class SendWeixinRequestTools {
     public static void sendDefaultMessage(String groupName, String robotId, String weixinGroupId) {
         String content = "";
         if (StringUtil.isEmpty(groupName)) {
-            content = "欢迎加入本书!凭以下关键词领取任务或资源：";
+            content = "欢迎加入本群，凭以下关键词领取任务或资源：";
         } else {
-            content = "欢迎加入本书!\"" + groupName + "\"凭以下关键词领取任务或资源：";
+            content = "欢迎加入" + groupName + "！凭以下关键词领取任务或资源：";
         }
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);

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

@@ -360,6 +360,8 @@
             c.is_delete = 0
         AND
             g.is_delete = 0
+        AND bg.is_delete = 0
+        AND b.is_delete = 0
         AND
             c.create_user = #{adviserId}
         <if test="bookIds != null">

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

@@ -195,7 +195,7 @@
             qrcode_state = #{qrcodeState},
             update_time = now()
         </set>
-        WHERE id = #{id}
+        WHERE id = #{id} and qrcode_state = 1
     </update>