结算后显示为0处理

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamSummaryQryExe.java

@@ -205,8 +205,7 @@ public class BdTeamSummaryQryExe {
                 .collect(Collectors.toSet());
 
         // 查询账单数据
-        Map<Long, TeamBillCycle> billCycleMap = teamBillCycleService.mapByTeamIds2(
+        Map<Long, TeamBillCycle> billCycleMap = teamBillCycleService.mapByTeamIds(teamIdSet, currentBillBelong);
-                teamIdSet, currentBillBelong, TeamBillCycleStatus.UNPAID);
 
         Map<Long, List<TeamMemberTarget>> memberTargetMap =
                 teamMemberTargetService.mapMemberBillTarget(teamIdSet, currentBillBelong);
@@ -239,8 +238,7 @@ public class BdTeamSummaryQryExe {
                 .collect(Collectors.toSet());
 
         // 2. 查询账单周期
-        Map<Long, TeamBillCycle> billCycleMap = teamBillCycleService.mapByTeamIds2(
+        Map<Long, TeamBillCycle> billCycleMap = teamBillCycleService.mapByTeamIds(teamIdSet, currentBillBelong);
-                teamIdSet, currentBillBelong, TeamBillCycleStatus.UNPAID);
 
         // 3. 查询成员目标
         Map<Long, List<TeamMemberTarget>> memberTargetMap =

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamBillCycleService.java

@@ -27,6 +27,11 @@ public interface TeamBillCycleService {
    */
   Map<Long, TeamBillCycle> mapByTeamIds2(Set<Long> teamIds, Integer billBelong, TeamBillCycleStatus status);
 
+  /**
+   * 获取一组账单信息.
+   */
+  Map<Long, TeamBillCycle> mapByTeamIds(Set<Long> teamIds, Integer billBelong);
+
   /**
    * 获取一组账单信息.
    */

rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamBillCycleServiceImpl.java

@@ -159,6 +159,24 @@ public class TeamBillCycleServiceImpl implements TeamBillCycleService {
         ));
   }
 
+  @Override
+  public Map<Long, TeamBillCycle> mapByTeamIds(Set<Long> teamIds, Integer billBelong) {
+    if (CollectionUtils.isEmpty(teamIds) || billBelong == null) {
+      return Maps.newHashMap();
+    }
+
+    List<TeamBillCycle> teamBillCycles = mongoTemplate.find(
+            Query.query(Criteria.where("teamId").in(teamIds)
+                    .and("billBelong").is(billBelong)
+            ),
+            TeamBillCycle.class);
+    if (CollectionUtils.isEmpty(teamBillCycles)) {
+      return Maps.newHashMap();
+    }
+    return teamBillCycles.stream()
+            .collect(Collectors.toMap(TeamBillCycle::getTeamId, v -> v, (v1, v2) -> v1));
+  }
+
   @Override
   public Map<String, TeamBillCycle> mapByBillIds(Set<Long> teamIds, Set<Integer> billBelongs) {
     if (CollectionUtils.isEmpty(teamIds) || CollectionUtils.isEmpty(billBelongs)) {