From 42fb1c3d7af152e33c9f6ac8288783f8b594d6e0 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Fri, 14 Mar 2025 17:04:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=AF=E7=94=A8=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/wfc/user/domain/vo/UAccountDashboardVo.java  |  2 ++
 .../wfc/user/service/impl/UAccountServiceImpl.java   | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java
index 071f105..c412505 100644
--- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java
+++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java
@@ -67,4 +67,6 @@ public class UAccountDashboardVo {
     private Long activity;
 
     private Integer status;
+
+    private Integer packageNum;
 }
diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
index cdec94c..e4ffb89 100644
--- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
+++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
@@ -37,11 +37,11 @@ import org.wfc.user.domain.vo.UAccountDashboardVo;
 import org.wfc.user.domain.vo.UCdrUserVo;
 import org.wfc.user.domain.vo.UClientCurrentVo;
 import org.wfc.user.mapper.UAccountMapper;
-import org.wfc.user.mapper.UAccountPackageMapper;
 import org.wfc.user.mapper.UBillMapper;
 import org.wfc.user.mapper.UBillRuleMapper;
 import org.wfc.user.mapper.UCdrMapper;
 import org.wfc.user.mapper.UClientMapper;
+import org.wfc.user.service.IUAccountPackageService;
 import org.wfc.user.service.IUAccountService;
 import org.wfc.user.service.IUClientService;
 import org.wfc.user.util.AccountUtil;
@@ -92,7 +92,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
     private IUClientService uClientService;
 
     @Autowired
-    private UAccountPackageMapper accountPackageMapper;
+    private IUAccountPackageService accountPackageService;
 
     @Transactional(rollbackFor = Exception.class)
     public void statAndCancelAuthUser() {
@@ -171,7 +171,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
                     UAccount account = this.getOne(Wrappers.<UAccount>lambdaQuery().eq(UAccount::getUserId, loginClient.getUserId()), false);
                     // 套餐失效，但是还有其他可用套餐
                     if (!AccountUtil.isPackageValid(account, current)) {
-                        List<UAccountPackage> accountPackages = accountPackageMapper.selectList(Wrappers.<UAccountPackage>lambdaQuery()
+                        List<UAccountPackage> accountPackages = accountPackageService.list(Wrappers.<UAccountPackage>lambdaQuery()
                                 .eq(UAccountPackage::getAccountId, account.getId()).orderByAsc(UAccountPackage::getCreateTime));
                         Optional<UAccountPackage> accountPackageOptional = accountPackages.stream().findFirst();
                         if (accountPackageOptional.isPresent()) {
@@ -189,7 +189,7 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
                             account.setEndTime(endTime);
                             // 更新账号套餐和删除使用套餐
                             this.updateById(account);
-                            accountPackageMapper.deleteById(accountPackage.getId());
+                            accountPackageService.removeById(accountPackage.getId());
                         }
                     }
 
@@ -284,8 +284,10 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
             } else {
                 dashboardVo.setStatus(0);
             }
-
         }
+
+        List<UAccountPackage> accountPackages = accountPackageService.queryList(new UAccountPackage());
+        dashboardVo.setPackageNum(accountPackages.size());
         return dashboardVo;
     }