From e16a9f6a4238ec02dc754be7b94639ad8af4e5a8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 07 三月 2025 18:42:07 +0800
Subject: [PATCH] 协议管理修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 153 +++++++++++++++++++++++++++++---------------------
1 files changed, 88 insertions(+), 65 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 69c6dcf..99c2f57 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
@@ -26,6 +26,7 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.member.controller.management.dto.MgtMemberDTO;
import com.ruoyi.member.controller.management.dto.MgtMemberPointsQuery;
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
@@ -53,7 +54,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -75,6 +78,7 @@
* @author mitao
* @since 2024-05-16
*/
+@Slf4j
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements IMemberService {
@@ -171,7 +175,7 @@
String user1= response.getOpenId();
LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Member::getZfbOpenid,response.getOpenId());
+ wrapper.eq(Member::getPhone, appMiniLoginDto.getPhone());
Member member=this.getOne(wrapper);
SysUser sysUser = null;
if (member != null) {
@@ -180,6 +184,7 @@
appMiniLoginVo.setSysUser(sysUser);
appMiniLoginVo.setMemberid(member.getId());
Member byId = this.getById(member.getId());
+ byId.setZfbOpenid(response.getOpenId());
if (appMiniLoginDto.getPhone()!=null){
byId.setPhone(appMiniLoginDto.getPhone());
this.updateById(byId);
@@ -192,7 +197,8 @@
sysUser.setNickName("白金用户");
sysUser.setUserType("03");
sysUser.setPhonenumber(response.getOpenId());
- sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+ sysUser.setAvatar(
+ "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
@@ -204,7 +210,8 @@
member.setDelFlag(0);
member.setNickname("白酒用户");
member.setPhone(appMiniLoginDto.getPhone());
- member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
+ member.setAvatar(
+ "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
member.setZfbOpenid(response.getOpenId());
this.save(member);
appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -232,55 +239,51 @@
sessionKey = session.getSessionKey();
//获取用户
LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Member::getMiniOpenid,session.getOpenid());
+ wrapper.eq(Member::getPhone, appMiniLoginDto.getPhone());
Member member=this.getOne(wrapper);
SysUser sysUser = null;
if (member != null) {
- sysUser = sysUserService.getSysUser(member.getUserId()).getData();
- }
- LambdaQueryWrapper<Member> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(Member::getMiniOpenid,openid);
- 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://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
- String password = "123456";
- sysUser.setPassword(SecurityUtils.encryptPassword(password));
- sysUser = sysUserService.registerUser(sysUser).getData();
- if (sysUser==null){
- sysUser = sysUserService.getSysUser(member.getUserId()).getData();
- }
- member = new Member();
- member.setUserId(sysUser.getUserId());
- member.setDelFlag(0);
- member.setNickname("白酒用户");
- 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());
- appMiniLoginVo.setWxUnionid(member.getWxUnionid());
- appMiniLoginVo.setSysUser(sysUser);
- appMiniLoginVo.setMemberid(member.getId());
- } else {
sysUser = sysUserService.getSysUser(member.getUserId()).getData();
appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
appMiniLoginVo.setWxUnionid(member.getWxUnionid());
appMiniLoginVo.setSysUser(sysUser);
appMiniLoginVo.setMemberid(member.getId());
Member byId = this.getById(member.getId());
- if (appMiniLoginDto.getPhone()!=null){
+ byId.setMiniOpenid(openid);
+ byId.setWxUnionid(unionid);
+ if (appMiniLoginDto.getPhone() != null) {
byId.setPhone(appMiniLoginDto.getPhone());
this.updateById(byId);
}
-
+ } else {
+ // 创建新用户
+ String memberId = IdUtils.simpleUUID();
+ sysUser = new SysUser();
+ sysUser.setUserName(memberId);
+ sysUser.setNickName("白金用户");
+ sysUser.setUserType("03");
+ sysUser.setAvatar(
+ "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
+ String password = "123456";
+ sysUser.setPassword(SecurityUtils.encryptPassword(password));
+ sysUser = sysUserService.registerUser(sysUser).getData();
+ if (sysUser == null) {
+ sysUser = sysUserService.getSysUser(member.getUserId()).getData();
+ }
+ member = new Member();
+ member.setUserId(sysUser.getUserId());
+ member.setDelFlag(0);
+ member.setNickname("白酒用户");
+ member.setAvatar(
+ "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
+ member.setWxUnionid(unionid);
+ member.setPhone(appMiniLoginDto.getPhone());
+ member.setMiniOpenid(openid);
+ this.save(member);
+ appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
+ appMiniLoginVo.setWxUnionid(member.getWxUnionid());
+ appMiniLoginVo.setSysUser(sysUser);
+ appMiniLoginVo.setMemberid(member.getId());
}
}
}
@@ -452,35 +455,37 @@
Map<String, String> openapiResult1 = JSON.parseObject(plainData,
new TypeReference<Map<String, String>>() {
}, Feature.OrderedField);
-
+ log.info("支付宝获取手机号返回值：{}", JSON.toJSONString(openapiResult1));
mobile=openapiResult1.get("mobile");
}
}else{
- String responseAccessToken = null;
- try {
- responseAccessToken = getAccessTokenByWX();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ if (StringUtils.isNotBlank(mobileDTO.getCode())) {
+ String responseAccessToken = null;
+ try {
+ responseAccessToken = getAccessTokenByWX();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
- JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
- String accessToken = jsonAccessToken.getString("access_token");
- String errmsg = jsonAccessToken.getString("errmsg");
- Long expiresIn = jsonAccessToken.getLong("expires_in");
- if (StringUtils.isBlank(accessToken)) {
- throw new ServiceException(errmsg);
+ JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
+ String accessToken = jsonAccessToken.getString("access_token");
+ String errmsg = jsonAccessToken.getString("errmsg");
+ Long expiresIn = jsonAccessToken.getLong("expires_in");
+ if (StringUtils.isBlank(accessToken)) {
+ throw new ServiceException(errmsg);
+ }
+ String responseUserPhoneNumber = null;
+ try {
+ responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
+ log.info("微信获取手机号返回值：{}", JSON.toJSONString(responseUserPhoneNumber));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
+ String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
+ JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
+ mobile = jsonUserPhoneInfo.getString("purePhoneNumber");
}
- String responseUserPhoneNumber = null;
- try {
- responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
- String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
- JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
- mobile= jsonUserPhoneInfo.getString("purePhoneNumber");
-
}
return mobile;
}
@@ -518,8 +523,12 @@
.like(StringUtils.isNotBlank(query.getRealName()), Member::getRealName,
query.getRealName())
.like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
+ .eq(StringUtils.isNotBlank(query.getLevel()), Member::getLevel, query.getLevel())
+ .eq(Objects.nonNull(query.getVipClassify()), Member::getVipClassify,
+ query.getVipClassify())
.orderByDesc(Member::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
+
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page.getTotal(), page.getPages());
}
@@ -543,7 +552,7 @@
Integer big=byId.getTotalPoints()+dMembeOneDTO.getTotalPoints();
byId.setTotalPoints(big);
}else {
- Integer big=byId.getTotalPoints()-dMembeOneDTO.getTotalPoints();
+ Integer big = Math.max(byId.getTotalPoints() - dMembeOneDTO.getTotalPoints(), 0);
byId.setTotalPoints(big);
}
}
@@ -629,7 +638,21 @@
.list();
}
+ @Override
+ public Member getMemberByUserId(Long userId) {
+ return this.lambdaQuery().eq(Member::getUserId, userId).oneOpt().orElse(null);
+ }
+ /**
+ * 编辑用户会员分类
+ * @param dto
+ * @return
+ */
+ @Override
+ public void updMemberClassify(MgtMemberDTO dto) {
+ Member member = BeanUtils.copyBean(dto, Member.class);
+ updateById(member);
+ }
}
--
Gitblit v1.7.1