From b82ddbd3a9a7856d8a4e791b0421f8c73a3faf6f Mon Sep 17 00:00:00 2001
From: qjq <1766193529@qq.com>
Date: Thu, 28 Nov 2024 18:06:08 +0800
Subject: [PATCH] 111

---
 .../module/member/dal/mysql/card/CardMapper.java    |  2 +-
 .../member/service/billing/BillingServiceImpl.java  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java
index 2561873f..42bb22b9 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/card/CardMapper.java
@@ -87,7 +87,7 @@ public interface CardMapper extends BaseMapperX<CardDO> {
         List<CardDO> cardDOS = selectList(new LambdaQueryWrapper<CardDO>()
                 .eq(CardDO::getFlag, flag)
                 .eq(CardDO::getType, type)
-                .ne(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode())
+                .eq(CardDO::getBillingExist, BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode())
                 .in(CardDO::getUserId, userIds));
         return   cardDOS.stream()
                 .map(CardDO::getChangeMoney)
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
index 25a73852..c146a437 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
@@ -610,8 +610,19 @@ public class BillingServiceImpl implements BillingService {
                 .eqIfPresent(BillingDO::getCarteenId,carteenId)
         );
         Map<Integer, List<BillingDO>> collect = billingDOS.stream().collect(Collectors.groupingBy(BillingDO::getStatus));
+        map.put(BillingStatusEnum.BILLING_INVOICING.getCode(),0);
+        map.put(BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode(),0);
+        map.put(BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode(),0);
         for (Map.Entry<Integer, List<BillingDO>> entry : collect.entrySet()) {
-            map.put(entry.getKey(),entry.getValue().size());
+            if (BillingStatusEnum.BILLING_INVOICING.getCode().equals(entry.getKey())) {
+                map.put(entry.getKey(),entry.getValue().size());
+            }
+            if (BillingStatusEnum.BILLING_INVOICING_IS_COMPLETE.getCode().equals(entry.getKey())) {
+                map.put(entry.getKey(),entry.getValue().size());
+            }
+            if (BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode().equals(entry.getKey())) {
+                map.put(entry.getKey(),entry.getValue().size());
+            }
         }
         return map;
     }