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 | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 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 55a5eb0..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
@@ -89,9 +89,9 @@
//微信
private static final String ACCESS_TOKEN_HOST = "https://api.weixin.qq.com/cgi-bin/token";
- private static final String WX_APPID = "wxe91f1af7638aa5dd";
+ private static final String WX_APPID = "wx69e3ac6e13a889b7";
- private static final String WX_SECRET = "a787e1a462715604e0c9528b6d8960d1";
+ private static final String WX_SECRET = "1b8bcfcb681524ac553e72054e5271ef";
//支付寶
/**
@@ -179,7 +179,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 +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();
@@ -199,7 +203,8 @@
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
member.setNickname("白酒用户");
- member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ member.setPhone(appMiniLoginDto.getPhone());
+ member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
member.setZfbOpenid(response.getOpenId());
this.save(member);
appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -245,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();
@@ -256,8 +261,9 @@
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);
this.save(member);
appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
@@ -270,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);
+ }
}
}
@@ -288,6 +296,7 @@
public Member getMembeid(MemberDTO memberDTO) {
return this.getById(memberDTO.getMemberid());
}
+
@Override
public void updateMembeid(MemberDTO memberDTO) {
@@ -341,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("实名认证失败,姓名或者身份证号有误");
}
@@ -432,7 +441,7 @@
String plainData = null;
if (isDataEncrypted) {
try {
- plainData = AlipayEncrypt.decryptContent(content, encryptType, "VSpPcLQjLSoTz6Yd7KNoyQ==", charset);
+ plainData = AlipayEncrypt.decryptContent(content, encryptType, "XABBSOeWDakvuG9TDez4Qg====", charset);
} catch (AlipayApiException e) {
//解密异常, 记录日志
e.getMessage();
@@ -510,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());
@@ -554,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