From 05ea2cf040cfc966c96998cea8570f8f90d3c7ad Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 06 五月 2025 18:28:04 +0800
Subject: [PATCH] 登录用户解析，手机号参数名修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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 3710030..5a6f02f 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
@@ -118,6 +118,7 @@
//查询用户是否注册，没有注册则注册
AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
if(null == appUser){
+ appUser = new AppUser();
//注册
//获取手机号
String decrypt = WXCore.decrypt(appletLogin.getEncryptedData_phone(), sessionKey, appletLogin.getIv_phone());
@@ -125,7 +126,7 @@
return R.fail("获取手机信息失败");
}
JSONObject phone = JSON.parseObject(decrypt);
- String purePhoneNumber = phone.getString("purePhoneNumber");
+ String purePhoneNumber = phone.getString("phoneNumber");
//新用户默认信息
appUser.setName(purePhoneNumber.substring(0, 3) + "****" + purePhoneNumber.substring(7));
appUser.setPhone(purePhoneNumber);
@@ -520,10 +521,31 @@
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);
+ list.forEach(x->{
+ x.setIdStr(String.valueOf(x.getId()));
+ });
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1