From 17abf0608f62cdd318dba3e7b12a32ea486cb482 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 21 四月 2025 20:34:03 +0800
Subject: [PATCH] 导入导出,财务统计

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 3710030..296e169 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -520,10 +520,28 @@
 		List<Shop> shopList = shopClient.getShopByUserId(userId).getData();
 		user.setShopStatus(0);//未拥有门店
 		if (shopList != null && !shopList.isEmpty()) {
+			user.setShopStatus(2);//门店都被冻结
 			for (Shop shop : shopList) {
-				user.setShopStatus(shop.getStatus());//门店状态
+				if (shop.getStatus()==1) {
+					user.setShopStatus(1);//门店状态
+				}
+				if(null==user.getShopIds()){
+					Set<Integer> integers = new HashSet<>();
+					user.setShopIds(integers);
+				}
+					user.getShopIds().add(shop.getId());
+					user.setShopIds(user.getShopIds());
+
 			}
 		}
 		return user;
 	}
+
+	@Override
+	public PageInfo<UserPointStatisticsVO> getUserPointPageList(String name, Integer pageCurr, Integer pageSize) {
+		PageInfo<UserPointStatisticsVO> pageInfo=new PageInfo<>(pageCurr,pageSize);
+		List<UserPointStatisticsVO> list=baseMapper.getUserPointPageList(pageInfo, name);
+		pageInfo.setRecords(list);
+		return pageInfo;
+	}
 }

--
Gitblit v1.7.1