Merge branch 'fixbug-zcy' into 'master'

添加canUseCount

See merge request rays/pcloud-book!317

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

@@ -46,6 +46,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -360,6 +361,13 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
 
         // 组合两部分数据
         for(QrStatisticsVO qr:qrStatistics){
+            List<Integer> list = Arrays.asList(1, 2, 4);
+            //社群吗需要过滤过期的群，个人码不需要
+            if (list.contains(qr.getVersion())) {
+                qr.setCanUseCount(weixinQrcodeDao.getCanUseCount(qr.getVersion()));
+            }else {
+                qr.setCanUseCount(qr.getNotUseCount());
+            }
             for(QrStatisticsVO c: counts){
                 if(qr.getVersion().equals(c.getVersion())){
                     qr.setAllCount(c.getAllCount());

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

@@ -172,4 +172,6 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
     void updateGenerationMachineIp(Integer generation, String machineIp);
 
     List<UpdateQrDTO> listUpdateQrByGeneration(Integer generation, Integer limit);
+
+    Integer getCanUseCount(Integer version);
 }

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

@@ -188,4 +188,9 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
         paramMap.put("num", limit);
         return this.getSessionTemplate().selectList(getStatement("listUpdateQrByGeneration"), paramMap);
     }
+
+    @Override
+    public Integer getCanUseCount(Integer version) {
+        return this.getSessionTemplate().selectOne(getStatement("getCanUseCount"), version);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/QrStatisticsVO.java

 package com.pcloud.book.group.vo;
 
 import java.io.Serializable;
-import java.util.Map;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,4 +24,7 @@ public class QrStatisticsVO implements Serializable {
 
     @ApiModelProperty("QR版本")
     private Integer version;
+
+    @ApiModelProperty("可用个数")
+    private Integer canUseCount;
 }
\ No newline at end of file

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

@@ -313,4 +313,9 @@
         ORDER BY update_qr_time ASC
         LIMIT #{num}
     </select>
+
+    <select id="getCanUseCount" parameterType="int" resultType="integer">
+        SELECT ifnull(COUNT(1), 0) FROM weixin_qrcode WHERE update_state !=2 AND use_state = 0
+        and generation = #{_parameter}
+    </select>
 </mapper>
\ No newline at end of file