Merge branch 'fix-zp-1022899' into 'master'

fix bug 1022899

See merge request rays/pcloud-book!679

pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechatgroup/WechatGroupConsr.java

@@ -181,6 +181,18 @@ public class WechatGroupConsr {
         return null;
     }
 
+    public Map<String, Integer> mapGroupMemberCount(List<String> weixinGroupIds) throws BizException {
+        if (ListUtils.isEmpty(weixinGroupIds)) {
+            return null;
+        }
+        try {
+            return ResponseHandleUtil.parseMapResponse(groupMemberService.mapGroupMemberCount(weixinGroupIds), String.class, Integer.class);
+        } catch (Exception e) {
+            log.error("获取群成员数量.[mapGroupMemberCount]:" + e.getMessage(), e);
+        }
+        return null;
+    }
+
     @ParamLog(value = "群分类累计进群人数与今日进群人数", isBefore = false, isAfterReturn = false)
     public Map<Long, Long> getclassifyMemberCount(List<Long> classifyIds) throws BizException {
         if (ListUtils.isEmpty(classifyIds)) {

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

@@ -830,6 +830,18 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
                 }
             }
         }
+        //从wechatGroup中获取群人数，设置群人数
+        List<String> wxGroupIds = pageBeanNew.getRecordList().stream().filter(s -> s.getWxGroupId() != null).map(GroupQrcodeBookVO::getWxGroupId).distinct().collect(Collectors.toList());
+        Map<String, Integer> userCountMap = wechatGroupConsr.mapGroupMemberCount(wxGroupIds);
+        for (GroupQrcodeBookVO vo : pageBeanNew.getRecordList()) {
+            Integer userNumber=0;
+            if(userCountMap==null) {
+                vo.setUserNumber(0);
+                continue;
+            }
+            userNumber = userCountMap.get(vo.getWxGroupId());
+            vo.setUserNumber(userNumber == null ? 0 : userNumber);
+        }
         return pageBeanNew;
     }
 

pcloud-service-book/src/main/resources/mapper/push/SelfPushMapper.xml

@@ -91,8 +91,10 @@
     p.send_time sendTime
     FROM
     self_push p
+    left join self_push_item i on i.push_id=p.id
     WHERE
     1 = 1
+    and i.item_type in (1,2,3,4,5,6)
     <if test="startTime != null and endTime != null">
       AND (
       (p.send_time BETWEEN #{startTime} AND #{endTime} )
@@ -110,6 +112,7 @@
         AND p.create_user = #{partyId}
       </otherwise>
     </choose>
+    group by p.id
     ORDER BY
     p.create_time DESC
   </select>