From 98933984fa1353d298a5117fb2a2d044fc51af93 Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 22 六月 2024 13:18:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 a14c80a..4c67702 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
@@ -33,7 +33,6 @@
import com.ruoyi.member.domain.MemberLevel;
import com.ruoyi.member.mapper.MemberLevelMapper;
import com.ruoyi.member.mapper.MemberMapper;
-import com.ruoyi.member.service.IMemberLevelService;
import com.ruoyi.member.service.IMemberPointsService;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.util.HttpUtils;
@@ -90,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";
//支付寶
/**
@@ -187,6 +186,7 @@
sysUser = new SysUser();
sysUser.setUserName(memberId);
sysUser.setNickName("白金用户");
+ sysUser.setUserType("03");
sysUser.setPhonenumber(response.getOpenId());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
String password = "123456";
@@ -199,6 +199,7 @@
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
member.setNickname("白酒用户");
+ member.setPhone(appMiniLoginDto.getPhone());
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setZfbOpenid(response.getOpenId());
this.save(member);
@@ -244,6 +245,7 @@
sysUser = new SysUser();
sysUser.setUserName(memberId);
sysUser.setNickName("白金用户");
+ sysUser.setUserType("03");
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
@@ -257,6 +259,7 @@
member.setNickname("白酒用户");
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setWxUnionid(unionid);
+ member.setPhone(appMiniLoginDto.getPhone());
member.setMiniOpenid(openid);
this.save(member);
appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
@@ -287,6 +290,7 @@
public Member getMembeid(MemberDTO memberDTO) {
return this.getById(memberDTO.getMemberid());
}
+
@Override
public void updateMembeid(MemberDTO memberDTO) {
@@ -391,8 +395,9 @@
}
@Override
- public void mobile(MobileDTO mobileDTO) {
+ public String mobile(MobileDTO mobileDTO) {
Member byId = this.getById(mobileDTO.getMemberid());
+ String mobile=null;
if (mobileDTO.getType()==1) {
if (mobileDTO.getAuth_code() == null || mobileDTO.getAuth_code().length() == 0) {
} else {
@@ -430,7 +435,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();
@@ -443,8 +448,7 @@
new TypeReference<Map<String, String>>() {
}, Feature.OrderedField);
- byId.setPhone(openapiResult1.get("mobile"));
- this.updateById(byId);
+ mobile=openapiResult1.get("mobile");
}
}else{
String responseAccessToken = null;
@@ -470,10 +474,10 @@
JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
- String mobile = jsonUserPhoneInfo.getString("purePhoneNumber");
- byId.setPhone(mobile);
- this.updateById(byId);
+ mobile= jsonUserPhoneInfo.getString("purePhoneNumber");
+
}
+ return mobile;
}
public static String getAccessTokenByWX() throws Exception {
@@ -506,11 +510,10 @@
@Override
public PageDTO<MgtMemberVO> getMemberPage(MgtMemberQuery query) {
Page<Member> page = this.lambdaQuery()
- .select(Member::getId, Member::getNickname, Member::getRealName, Member::getPhone,
- Member::getIdNumber)
.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());
--
Gitblit v1.7.1