From 157d966bfd9acf789de0784286398455f81da8f2 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 12 七月 2024 10:13:15 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 09028e6..0ecf080 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
@@ -192,7 +192,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();
@@ -204,7 +204,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());
@@ -250,7 +250,7 @@
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();
@@ -261,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);
@@ -564,18 +564,24 @@
if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
byId.setLevel(list.get(i).getLevel());
}else{
- byId.setLevel(list.get(i).getLevel());
+ if (cumulative1.compareTo(byId.getMoney())<=0){
+ 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());
+ if (i!=0&&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());
+ }
}
+
}
}
-
+ this.updateById(byId);
}
/**
--
Gitblit v1.7.1