From 79be3113b28c745c2f773983c2074690ae896a0a Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 17 七月 2024 19:13:17 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index 97b5f5a..5c36b86 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -179,7 +180,11 @@
appMiniLoginVo.setZfbuserid(response.getOpenId());
appMiniLoginVo.setSysUser(sysUser);
appMiniLoginVo.setMemberid(member.getId());
- redisService.setCacheObject(SecurityConstant.SESSION_KEY + response.getUserId(), null, 1L, TimeUnit.DAYS);
+ Member byId = this.getById(member.getId());
+ if (appMiniLoginDto.getPhone()!=null){
+ byId.setPhone(appMiniLoginDto.getPhone());
+ this.updateById(byId);
+ }
}else{
//创建新用户
String memberId = IdUtils.simpleUUID();
@@ -188,7 +193,7 @@
sysUser.setNickName("白金用户");
sysUser.setUserType("03");
sysUser.setPhonenumber(response.getOpenId());
- sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
@@ -200,7 +205,7 @@
member.setDelFlag(0);
member.setNickname("白酒用户");
member.setPhone(appMiniLoginDto.getPhone());
- member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
member.setZfbOpenid(response.getOpenId());
this.save(member);
appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -239,14 +244,13 @@
Member member1=this.getOne(wrapper1);
if (member1==null){
-
//创建新用户
String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
sysUser.setUserName(memberId);
sysUser.setNickName("白金用户");
sysUser.setUserType("03");
- sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
@@ -257,7 +261,7 @@
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
member.setNickname("白酒用户");
- member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
member.setWxUnionid(unionid);
member.setPhone(appMiniLoginDto.getPhone());
member.setMiniOpenid(openid);
@@ -272,11 +276,13 @@
appMiniLoginVo.setWxUnionid(member.getWxUnionid());
appMiniLoginVo.setSysUser(sysUser);
appMiniLoginVo.setMemberid(member.getId());
+ Member byId = this.getById(member.getId());
+ if (appMiniLoginDto.getPhone()!=null){
+ byId.setPhone(appMiniLoginDto.getPhone());
+ this.updateById(byId);
}
-
-
- redisService.setCacheObject(SecurityConstant.SESSION_KEY + openid, sessionKey, 1L, TimeUnit.DAYS);
+ }
}
}
@@ -344,13 +350,13 @@
response.close();
httpClient.close();
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new RuntimeException("姓名或者身份证号有误");
}
}
JSONObject jsonObject= JSON.parseObject(result);
String object1= jsonObject.get("reason").toString();
if(!object1.equals("成功")){
- throw new ServiceException(object1);
+ throw new ServiceException("实名认证失败,姓名或者身份证号有误");
}
@@ -513,6 +519,7 @@
.like(StringUtils.isNotBlank(query.getRealName()), Member::getRealName,
query.getRealName())
.like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
+ .orderByDesc(Member::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page.getTotal(), page.getPages());
@@ -543,32 +550,32 @@
this.updateById(byId);
LambdaQueryWrapper<MemberLevel> wrapper= Wrappers.lambdaQuery();
List<MemberLevel> list = memberLevelMapper.selectList(wrapper);
- for (int i=0;i<list.size();i++){
- if (i==0){
- int ia = byId.getMoney().compareTo(list.get(0).getCumulativeConsumption());
- if (ia<0){
- byId.setLevel(0);
- break;
- }
- }
- if (i==list.size()-1){
- BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
- BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
- if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
- byId.setLevel(list.get(i).getLevel());
- }else{
- byId.setLevel(list.get(i).getLevel());
- }
- }else {
- BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
- BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
- if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
- byId.setLevel(list.get(i).getLevel());
- }
+ int appropriateLevel = findAppropriateLevel(list, byId.getMoney());
+ byId.setLevel(appropriateLevel);
+ this.updateById(byId);
+ }
+
+
+ private static int findAppropriateLevel(List<MemberLevel> memberLevels, BigDecimal money) {
+ // 对于最开始的level，设置为0（假设0是最低等级）
+ int level = 0;
+
+ for (int i = 0; i < memberLevels.size(); i++) {
+ MemberLevel currentLevel = memberLevels.get(i);
+ BigDecimal currentCumulativeConsumption = currentLevel.getCumulativeConsumption();
+
+ // 如果当前成员的消费额小于等于当前等级的累积消费额
+ if (money.compareTo(currentCumulativeConsumption) < 0) {
+ return level;
}
+ // 更新level为当前等级，准备下一次比较
+ level = currentLevel.getLevel();
}
+ // 如果遍历完成后还没有返回，说明该成员的消费额高于所有已定义等级的累积消费额
+ level = memberLevels.get(memberLevels.size() - 1).getLevel();
+ return level;
}
/**
@@ -621,6 +628,8 @@
.orderByDesc(Member::getLevel)
.list();
}
+
+
}
--
Gitblit v1.7.1