From 05c1b69b9a694cf99e9f07f12ebf034cb2450f5f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 二月 2025 10:15:38 +0800
Subject: [PATCH] websocket改造
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 193 +++++++++++++++++++++++++-----------------------
1 files changed, 101 insertions(+), 92 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 7a0e9a8..ba48a02 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
@@ -37,7 +37,6 @@
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.constants.SecurityConstant;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberPoints;
@@ -54,8 +53,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
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;
@@ -66,6 +65,8 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -75,6 +76,7 @@
* @author mitao
* @since 2024-05-16
*/
+@Slf4j
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements IMemberService {
@@ -171,7 +173,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 +182,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 +195,8 @@
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/ca8552a34fb64d4d846afa1b5b173cf9.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
@@ -204,7 +208,8 @@
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/ca8552a34fb64d4d846afa1b5b173cf9.png");
member.setZfbOpenid(response.getOpenId());
this.save(member);
appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -232,56 +237,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://hongruitang.oss-cn-beijing.aliyuncs.com/default.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://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());
- 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());
}
}
}
@@ -350,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("实名认证失败,姓名或者身份证号有误");
}
@@ -453,35 +453,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;
}
@@ -519,6 +521,7 @@
.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())
.orderByDesc(Member::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
@@ -528,6 +531,7 @@
}
@Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
public void updMembeOne(updMembeOneDTO dMembeOneDTO) {
Member byId = this.getById(dMembeOneDTO.getMemberId());
if (dMembeOneDTO.getMoney()!=null){
@@ -543,39 +547,39 @@
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);
}
}
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;
}
/**
@@ -628,6 +632,11 @@
.orderByDesc(Member::getLevel)
.list();
}
+
+ @Override
+ public Member getMemberByUserId(Long userId) {
+ return this.lambdaQuery().eq(Member::getUserId, userId).oneOpt().orElse(null);
+ }
}
--
Gitblit v1.7.1