Merge branch 'ruansiyuan' into 'master'

获取群的时候加个条件

See merge request rays/pcloud-book!101

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

@@ -22,7 +22,7 @@ public interface WeixinQrcodeBiz {
      * @Desr:从二维码获取一个二维码
      * @Date:2019/4/17 16:17
      */
-    WeixinQrcodeDTO getOneQrcode();
+    WeixinQrcodeDTO getOneQrcode(Integer generation);
 
     /**
      * @Author:lili

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

@@ -193,7 +193,11 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
                 throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足，您可以明天再创建群。");
             }
         }
-        WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode();
+        Integer generation = null;
+        if (new Integer(2).equals(qrcodeNameAndProId.getJoinGroupType())) {
+            generation = 3;
+        }
+        WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode(generation);
         if (oneQrcode == null) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "系统二维码数量不足，请联系客服人员补充二维码数量！");
         }

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

@@ -9,22 +9,10 @@ import com.pcloud.book.consumer.label.LabelConsr;
 import com.pcloud.book.consumer.reader.ReaderConsr;
 import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
-import com.pcloud.book.group.biz.BookGroupClassifyBiz;
-import com.pcloud.book.group.biz.GroupAnnouncementBiz;
-import com.pcloud.book.group.biz.GroupQrcodeBiz;
-import com.pcloud.book.group.biz.WeixinQrcodeBiz;
+import com.pcloud.book.group.biz.*;
 import com.pcloud.book.group.constants.BookBusinessConstants;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
-import com.pcloud.book.group.dto.AutoUpdateGroupNumDTO;
-import com.pcloud.book.group.dto.BookWxQrcodeDTO;
-import com.pcloud.book.group.dto.ChangeGroupNameDTO;
-import com.pcloud.book.group.dto.GroupAndUserNumberDTO;
-import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
-import com.pcloud.book.group.dto.GroupQrcodeDTO;
-import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
-import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
-import com.pcloud.book.group.dto.PushAddUserMessageDTO;
-import com.pcloud.book.group.dto.WeixinQrcodeDTO;
+import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.QrcodeStatusEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
@@ -106,6 +94,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     private AdvertisingSpaceBiz advertisingSpaceBiz;
     @Autowired
     private LabelConsr labelConsr;
+    @Autowired
+    private BookGroupBiz bookGroupBiz;
 
 
     /**
@@ -483,7 +473,15 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     @ParamLog("重新分配一个群")
     @Transactional(rollbackFor = Exception.class)
     public void addWechatGroup(Long classifyId, Long groupQrcodeId) {
-        WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode();
+        Integer generation = null;
+        ClassifyVO classifyVOOne = bookGroupClassifyBiz.getClassify(classifyId);
+        if (classifyVOOne != null && classifyVOOne.getBookGroupId() != null) {
+            QrcodeNameAndProIdDTO qrcodeNameAndProId = bookGroupBiz.getQrcodeNameAndProId(classifyVOOne.getBookGroupId());
+            if (qrcodeNameAndProId != null && new Integer(2).equals(qrcodeNameAndProId.getJoinGroupType())) {
+                generation = 3;
+            }
+        }
+        WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode(generation);
         log.info("[重新分配一个群] : oneQrcode:{}", oneQrcode);
         if (oneQrcode != null) {
             //将二维码改为已满群状态

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

@@ -84,8 +84,8 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
     @Override
     @ParamLog("从二维码库获取一个二维码")
     @Transactional(propagation = Propagation.NOT_SUPPORTED)
-    public WeixinQrcodeDTO getOneQrcode() {
-        WeixinQrcodeDTO qrcodeVO = weixinQrcodeDao.getOneWechatGroup();
+    public WeixinQrcodeDTO getOneQrcode(Integer generation) {
+        WeixinQrcodeDTO qrcodeVO = weixinQrcodeDao.getOneWechatGroup(generation);
         if (qrcodeVO == null) {
             return null;
         }

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

@@ -24,7 +24,7 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
      * @Desr:获取一个微信群
      * @Date:2019/3/12 18:04
      */
-    WeixinQrcodeDTO getOneWechatGroup();
+    WeixinQrcodeDTO getOneWechatGroup(Integer generation);
 
     /**
      * @Author:lili

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

@@ -25,7 +25,9 @@ import java.util.Map;
 @Component("WeixinQrcodeDao")
 public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements WeixinQrcodeDao {
     @Override
-    public WeixinQrcodeDTO getOneWechatGroup() {
+    public WeixinQrcodeDTO getOneWechatGroup(Integer generation) {
+        Map<String, Object> paramMap = new HashMap();
+        paramMap.put("generation", generation);
         return this.getSqlSession().selectOne(this.getStatement("getOneWechatGroup"));
     }
 

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

@@ -18,6 +18,11 @@ public class QrcodeNameAndProIdDTO {
      */
     private Long productId;
 
+    /**
+     * 进群方式：1群二维码，2客服机器人
+     */
+    private Integer joinGroupType;
+
     public Long getBookGroupId() {
         return bookGroupId;
     }
@@ -42,12 +47,21 @@ public class QrcodeNameAndProIdDTO {
         this.productId = productId;
     }
 
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "QrcodeNameAndProIdDTO{" +
                 "bookGroupId=" + bookGroupId +
                 ", groupQrcodeName='" + groupQrcodeName + '\'' +
                 ", productId=" + productId +
+                ", joinGroupType=" + joinGroupType +
                 '}';
     }
 }

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

@@ -88,7 +88,7 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
     @Override
     @GetMapping("getOneQrcode")
     public ResponseEntity<ResponseDto<WeixinQrcodeDTO>> getOneQrcode() {
-        return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getOneQrcode());
+        return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getOneQrcode(null));
     }
 
     @Override

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

@@ -237,6 +237,7 @@
     <select id="getQrcodeNameAndProId" resultType="QrcodeNameAndProIdDTO" parameterType="java.lang.Long">
         select
         group_qrcode_name groupQrcodeName,
+        join_group_type joinGroupType,
         product_id productId
         from book_group
         where id = #{_parameter,jdbcType=BIGINT}

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

@@ -36,6 +36,12 @@
         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 in (0,1,3) and weixin_group_id != ''
+        <if test="generation!=null">
+            and generation=#{generation}
+        </if>
+        <if test="generation==null">
+            and generation in (1,2)
+        </if>
         LIMIT 1
     </select>