From 810d81a44d78bc3e7c42c2f116cc9968ab04baef Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 15:57:28 +0800
Subject: [PATCH] 修改门店首页统计bug

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 2561d96..c3e62b9 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
@@ -286,6 +286,12 @@
 		if(null != appUser1 && appUser1.getStatus() == 2){
 			return R.fail("手机号已注册,请直接登录!");
 		}
+
+		String avatar = registerAccount.getAvatar();
+		if (StringUtils.isEmpty(avatar)){
+			avatar = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/aedfbbb41280471f8d9fa7905298b65f.png";
+		}
+
 		//如果手机号已注册,但是没有微信号,则将微信号添加到已有账户上
 		if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
 			appUser1.setWxOpenid(openid);
@@ -293,7 +299,7 @@
 			appUser = appUser1;
 		}else if(null == appUser){
 			appUser = new AppUser();
-			appUser.setAvatar(registerAccount.getAvatar());
+			appUser.setAvatar(avatar);
 			appUser.setName(registerAccount.getName());
 			appUser.setPhone(registerAccount.getPhone());
 			appUser.setWxOpenid(openid);
@@ -888,7 +894,7 @@
 					.eq(AppUser::getStatus, 1).in(AppUser::getId, replaceable));
 			for (AppUser appUser : list) {
 				Long data = orderClient.getOrderCountByAppUserId(appUser.getId()).getData();
-				if(data == 0){
+				if(data == 0L){
 					appUser.setChangePromoter(1);
 					this.updateById(appUser);
 				}
@@ -967,6 +973,8 @@
 				Set<Integer> shopIds = shopR.getData();
 				if (!CollectionUtils.isEmpty(shopIds)){
 					appUser.setShopIds(shopIds);
+				}else {
+					return new Page<>();
 				}
 			}
 		}
@@ -1047,4 +1055,9 @@
 			}
 		}
 	}
+
+	@Override
+	public List<AppUser> getAppUserByPhoneNoFilter(String phone) {
+		return this.baseMapper.getAppUserByPhoneNoFilter(phone);
+	}
 }

--
Gitblit v1.7.1