From 79be3113b28c745c2f773983c2074690ae896a0a Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 17 七月 2024 19:13:17 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 480 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 350 insertions(+), 130 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 0abeed2..5c36b86 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
@@ -5,38 +5,58 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.parser.Feature;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.internal.util.AlipayEncrypt;
+import com.alipay.api.internal.util.AlipaySignature;
import com.alipay.api.request.AlipaySystemOauthTokenRequest;
import com.alipay.api.response.AlipaySystemOauthTokenResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
+import com.ruoyi.common.core.utils.page.PageDTO;
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.dto.MemberDTO;
+import com.ruoyi.member.controller.management.dto.MgtMemberPointsQuery;
+import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
+import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
+import com.ruoyi.member.controller.management.vo.MgtMemberVO;
+import com.ruoyi.member.domain.MemberLevel;
+import com.ruoyi.member.mapper.MemberLevelMapper;
import com.ruoyi.member.mapper.MemberMapper;
+import com.ruoyi.member.service.IMemberPointsService;
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 java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
-
+import com.ruoyi.system.api.domain.MemberPoints;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MobileDTO;
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -62,7 +82,7 @@
public static RequestConfig config = RequestConfig.custom().setConnectTimeout(5000).setSocketTimeout(5000).build();
// 配置您申请的KEY,在个人中心->我的数据,接口名称上方查看
- public static final String APPKEY = "";
+ public static final String APPKEY = "61ad64e1ea78a24e00c449c346caa5d7";
//明文查询地址
public static String query_url = "http://op.juhe.cn/idcard/query?key=" + APPKEY;
@@ -70,9 +90,9 @@
//微信
private static final String ACCESS_TOKEN_HOST = "https://api.weixin.qq.com/cgi-bin/token";
- private static final String WX_APPID = "wxb7f0ea286fc4e535";
+ private static final String WX_APPID = "wx69e3ac6e13a889b7";
- private static final String WX_SECRET = "852a2512a6ab559cafc68bae5d4160ac";
+ private static final String WX_SECRET = "1b8bcfcb681524ac553e72054e5271ef";
//支付寶
/**
@@ -92,20 +112,16 @@
/**
* appID
**/
- private static final String APP_ID_PROD = "2021003196653501";
+ private static final String APP_ID_PROD = "2021004150664294";
/**
* 私钥
*/
- private static final String APP_PRIVATE_KEY = "";
+ private static final String APP_PRIVATE_KEY = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3ap1qQ5GTe+syB8Tu/fH8nRdpjA7yNgLINR/kFq1VFzxDref7DQDUDWXt+s5QZyBjL1UfbQWtA96F+OpgmIiNMdZSn9FH/w5XSqSd7B4nAa1sgfdLdZDvm+crqzn8OzyEJTrO8tihF+9K+btBl37s3QfmmzCRl1PAAMGqfy/JcQ2aivY+hxb25V0kD5AAXM7mVC2zzcBrykzafQCXEnDC7ls4Hjy0agmq1bKSx8SLYTsXAzZiGk9E7yh76nDAB+P1+kKPEYJXociU3k4YRR7l+6tzBPd+/mVkL34nuV5IiAK/795CrP/9gC50nZK/6CqSPDlQlOaAaJ2uZvAOeKx3AgMBAAECggEAMzw5+swjJ0KvYYtgDK6tYTZ0qswwBKLnxgto/CsFgkZ6VCGJMszgFVwkxASSi00zc+Ft8thehIUXLO9qcU9Knb51MyFnsafi1qmIMIEbryO90RjA/rg5o2U2fzFWgkn9zqAjvFmEAAQSmSwHjfwGvZ3Erjtdpt3RzEmpz7m1nJxYuZ2JLdo8AIY+iYn1NeDxHMi27RtqsZje7RV5YXrqKtMMzW2atmj+Dbn/E1pxpF0Dz6l0TqQh5B+9j1XlPTZKcYOYHNI0ACV+dV1NZsqmdhX0lKtQbsj/Q67vhq7uCmQRKcEka/5Z0X/TOKbwJE6i2/YEuA4PUGLpBMZQXhSGYQKBgQD50IuUTG6fg1dqFt9bJXxq2i1lkIHvzaCkHqVnTMyTDs+VcO2S6YaAFy6BLSI933qvHLogkhqnHiN+BRHe/M5+4TAOx30SQlJYa5ojpNFwMnRSZgxLoEddwlfj6qTnCgDW3CsUPR85x85NjIhONy75muNnNG8GHdn3blk2Y7KhpwKBgQC79TQhz5eJ6cwiWPWMWnnSAVvFKW4iPZjkbk+Sl7JXuqzvsdE47gGN0Vk8iYWEc2WrnQY6vf7WnamQYi+Gr5ySfTSt9qwvRx0IRzHdSZkOsHJLBCnAt+Pf+pSBc2Z788iUXVbDRAIfF6YYG44P3jHspbnGPJt14PP0sHbPmh7YsQKBgGzGGYChJyndjpprCyYs1FfSWCH5IhrAdkn/7hVko08FC+4OFeP6Os5bSayFcntua4UEBSdZdrF9tgaRPo7RlTg55SsKQbNJnYFSmPMcOPWZgny+YmwrheeVT5+188eF24eypi9Rzd7i2Tl7D36/GH0mrA2sDwuiw92w9rdwAb/RAoGAf6RDZPqvNI87e8/h4RDITd9yTPCXxFUEcYygKTMvf/hb3ONq7DhlgcO70CqsK4iacPLP+jBw0Zp8PnsPP24e7DRvA/zSbcDjbG285URH1vvogh0vpZq7+60WENsnq+GgQ3EnrK+QqUDMIO8FiK0iRk09XexmvqSnx3HXHaDSdeECgYB9htO5mOn2/ugIeMw11g+JJkZ/hzE55/6fLf7zh3yel5EflmAdYRv0lHafjyXIzNrAnBgD95x4LKGLi9A5AMo9SJJu0ZOg1KujKPVY4ByCm9SO7ErJDuHI4AhtewdHhYDpnXMakoxm/medSjlt7GCVv7E/eDpNZs+MLi9MiTFx2g==";
/**
* 支付宝公钥
*/
- private static final String ALIPAY_PUBLIC_KEY = "";
+ private static final String ALIPAY_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlW2RMACojdqTa8H+j6411Lm5UipGXXbQiswq50rUflwjTj843zNVaVpk8uJmbdmtUBJlmblgBS/a31O4L4LrHB8WxJ+w0f9DBNTq9T6b80MiAVnU/3gXK365DmbzPWS5pR9wEgJVHnfOFUbsB5AVFHV0m9hUZcPv7xveuEp3BEoD5smaDJByR+KgFw0Q0JgINhhE6bsEa3UgJ198af269LtQ5HJl1TWLI8aeqW14HrxyADIt49NB9KZ8MOdKP+66HWcrXlipKFHtccy3dff72DqPmFdESoXfLXKZyhU5w9v4Q5F6UoAGTPwl9KQwikTobNeJ/7su7X3AB6+C14J4sQIDAQAB";
-
-
- @Resource
- private IMemberService iMemberService;
@Resource
private WxMaService wxMaService;
@@ -116,10 +132,17 @@
@Resource
private RedisService redisService;
- @Override
- public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) {
- AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();
+ @Resource
+ private MemberLevelMapper memberLevelMapper;
+
+ @Resource
+ private IMemberPointsService memberPointsService;
+
+
+ @Override
+ public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception {
+ AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();
if(appMiniLoginDto.getType()==1){
if (appMiniLoginDto.getAuth_code()== null || appMiniLoginDto.getAuth_code().length() == 0) {
} else {
@@ -141,23 +164,55 @@
}
//刷新令牌，上次换取访问令牌时得到。见出参的refresh_token字段
request.setRefreshToken(response.getAccessToken());
+
//返回成功时 就将唯一标识返回
if (response.isSuccess()) {
System.out.println("调用成功");
//我这里只返回了一个字段给前端用
- String user1= response.getUserId();
+ String user1= response.getOpenId();
LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Member::getZfbOpenid,response.getUserId());
- Member member=iMemberService.getOne(wrapper);
+ wrapper.eq(Member::getZfbOpenid,response.getOpenId());
+ Member member=this.getOne(wrapper);
SysUser sysUser = null;
if (member != null) {
sysUser = sysUserService.getSysUser(member.getUserId()).getData();
+ appMiniLoginVo.setZfbuserid(response.getOpenId());
+ appMiniLoginVo.setSysUser(sysUser);
+ appMiniLoginVo.setMemberid(member.getId());
+ Member byId = this.getById(member.getId());
+ 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.setPhonenumber(response.getOpenId());
+ 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.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());
+ appMiniLoginVo.setSysUser(sysUser);
+ appMiniLoginVo.setMemberid(member.getId());
}
- appMiniLoginVo.setZfbuserid(response.getUserId());
- appMiniLoginVo.setSysUser(sysUser);
- appMiniLoginVo.setMemberid(member.getId());
- redisService.setCacheObject(SecurityConstant.SESSION_KEY + response.getUserId(), null, 1L, TimeUnit.DAYS);
+
}
}
}else{
@@ -178,18 +233,56 @@
sessionKey = session.getSessionKey();
//获取用户
LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Member::getZfbOpenid,session.getOpenid());
- Member member=iMemberService.getOne(wrapper);
+ wrapper.eq(Member::getMiniOpenid,session.getOpenid());
+ Member member=this.getOne(wrapper);
SysUser sysUser = null;
if (member != null) {
sysUser = sysUserService.getSysUser(member.getUserId()).getData();
}
- appMiniLoginVo.setMiniOpenid(openid);
- appMiniLoginVo.setWxUnionid(unionid);
- appMiniLoginVo.setMemberid(member.getId());
- appMiniLoginVo.setSysUser(sysUser);
- appMiniLoginVo.setSessionKey(sessionKey);
- redisService.setCacheObject(SecurityConstant.SESSION_KEY + openid, sessionKey, 1L, TimeUnit.DAYS);
+ 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.setPhone(appMiniLoginDto.getPhone());
+ this.updateById(byId);
+ }
+
+ }
}
}
@@ -201,36 +294,41 @@
@Override
public Member getMembeid(MemberDTO memberDTO) {
- return iMemberService.getById(memberDTO.getMemberid());
+ return this.getById(memberDTO.getMemberid());
}
+
@Override
public void updateMembeid(MemberDTO memberDTO) {
- Member member= iMemberService.getById(memberDTO.getMemberid());
+ Member member= this.getById(memberDTO.getMemberid());
if (memberDTO.getAvatar()!=null){
member.setAvatar(memberDTO.getAvatar());
}
if (memberDTO.getNickname()!=null){
member.setNickname(memberDTO.getNickname());
}
- iMemberService.updateById(member);
+ this.updateById(member);
}
@Override
public void authentificationMembe(MemberDTO memberDTO) {
- Member member= iMemberService.getById(memberDTO.getMemberid());
+ Member member= this.getById(memberDTO.getMemberid());
member.setPhone(memberDTO.getPhone());
+ if(memberDTO.getIdNumber()==null){
+ throw new ServiceException("身份证号不能为空");
+ }
+ if(memberDTO.getRealName()==null){
+ throw new ServiceException("姓名不能为空");
+ }
member.setIdNumber(memberDTO.getIdNumber());
member.setRealName(memberDTO.getRealName());
-
String realname = "";// 姓名
String idcard = "";// 身份证
int type = 1;// 普通版,不需要加密
Map<String, Object> params = new HashMap<>();
- params.put("realname", realname);
- params.put("idcard", idcard);
-
+ params.put("realname", memberDTO.getRealName());
+ params.put("idcard", memberDTO.getIdNumber());
CloseableHttpClient httpClient = HttpClients.createDefault();
CloseableHttpResponse response = null;
String result = null;
@@ -252,32 +350,36 @@
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("实名认证失败,姓名或者身份证号有误");
+ }
+
+
String object= jsonObject.get("result").toString();
JSONObject jsonObject1= JSON.parseObject(object);
if (Integer.valueOf(jsonObject1.get("res").toString())==2){
throw new ServiceException("实名认证失败");
}
-
- String sex=getGender(idcard);
+ String sex=getGender(memberDTO.getIdNumber());
if (sex.equals("女")){
member.setGender(GenderEnum.FEMALE);
}
if (sex.equals("男")){
member.setGender(GenderEnum.MALE);
}
-
- iMemberService.updateById(member);
+ member.setIsAuthentication(2);
+ this.updateById(member);
}
public static String getGender(String idNumber) {
int genderNum = Integer.parseInt(idNumber.substring(16, 17));
return genderNum % 2 == 0 ? "女" : "男";
}
-
public static String urlencode(Map<String, ?> data) {
StringBuilder sb = new StringBuilder();
@@ -294,99 +396,94 @@
}
@Override
- public List<Member> getMemberListByIds(Set<Long> memberIdList) {
+ public List<Member> getMemberListByIds(Collection<Long> memberIdList) {
return this.listByIds(memberIdList);
}
@Override
- public AppMiniLoginVO miniRegister(AppMiniRegisterDTO appMiniRegisterDTO) {
- AppMiniLoginVO appMiniLoginVO =new AppMiniLoginVO();
- SysUser sysUser;
- if (appMiniRegisterDTO.getType() == 1) {
- LambdaQueryWrapper<Member> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(Member::getZfbOpenid, appMiniRegisterDTO.getZfbuserid());
- Member member = iMemberService.getOne(wrapper);
+ 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 {
+ //1. 获取验签和解密所需要的参数
+ Map<String, String> openapiResult = JSON.parseObject(mobileDTO.getAuth_code(),
+ new TypeReference<Map<String, String>>() {
+ }, Feature.OrderedField);
+ String signType = "RSA2";
+ String charset = "UTF-8";
+ String encryptType = "AES";
+ String sign = openapiResult.get("sign");
+ String content = openapiResult.get("response");
- //获取用户为空则新建
- if (member == null) {
- //创建新用户
- String memberId = IdUtils.simpleUUID();
- sysUser = new SysUser();
- sysUser.setUserName(memberId);
- sysUser.setUserType("03");
- sysUser.setNickName("白金用户");
- sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
- sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
- String password = "123456";
- sysUser.setPassword(SecurityUtils.encryptPassword(password));
- sysUser = sysUserService.registerUser(sysUser).getData();
+ //如果密文的
+ boolean isDataEncrypted = !content.startsWith("{");
+ boolean signCheckPass = false;
- member = new Member();
- member.setUserId(sysUser.getUserId());
- member.setDelFlag(0);
- member.setRealName("白酒用户");
- member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
- member.setWxUnionid(appMiniRegisterDTO.getWxUnionid());
- member.setMiniOpenid(appMiniRegisterDTO.getMiniOpenid());
- iMemberService.save(member);
+ //2. 验签
+ String signContent = content;
- appMiniLoginVO.setMiniOpenid(member.getMiniOpenid());
- appMiniLoginVO.setWxUnionid(member.getWxUnionid());
- appMiniLoginVO.setSysUser(sysUser);
- appMiniLoginVO.setMemberid(member.getId());
- } else {
- sysUser = sysUserService.getSysUser(member.getUserId()).getData();
- appMiniLoginVO.setZfbuserid( appMiniRegisterDTO.getZfbuserid());
- appMiniLoginVO.setSysUser(sysUser);
- appMiniLoginVO.setMemberid(member.getId());
+ //如果是加密的报文则需要在密文的前后添加双引号
+ if (isDataEncrypted) {
+ signContent = "\"" + signContent + "\"";
+ }
+ try {
+ signCheckPass = AlipaySignature.rsaCheck(signContent, sign, ALIPAY_PUBLIC_KEY, charset, signType);
+ } catch (AlipayApiException e) {
+ //验签异常, 日志
+ }
+ if (!signCheckPass) {
+ //验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
}
- }
- if (appMiniRegisterDTO.getType() == 2) {
- LambdaQueryWrapper<Member> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(Member::getMiniOpenid, appMiniRegisterDTO.getMiniOpenid());
- Member member = iMemberService.getOne(wrapper);
- //获取用户为空则新建
- if (member == null) {
- //创建新用户
- String memberId = IdUtils.simpleUUID();
- sysUser = new SysUser();
- sysUser.setUserName(memberId);
- sysUser.setUserType("03");
- sysUser.setNickName("白金用户");
- sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
- sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
- String password = "123456";
- sysUser.setPassword(SecurityUtils.encryptPassword(password));
- sysUser = sysUserService.registerUser(sysUser).getData();
-
- member = new Member();
- member.setUserId(sysUser.getUserId());
- member.setDelFlag(0);
- member.setRealName("白酒用户");
- member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
- member.setWxUnionid(appMiniRegisterDTO.getWxUnionid());
- member.setMiniOpenid(appMiniRegisterDTO.getMiniOpenid());
- iMemberService.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());
+ //3. 解密
+ String plainData = null;
+ if (isDataEncrypted) {
+ try {
+ plainData = AlipayEncrypt.decryptContent(content, encryptType, "XABBSOeWDakvuG9TDez4Qg====", charset);
+ } catch (AlipayApiException e) {
+ //解密异常, 记录日志
+ e.getMessage();
}
+ } else {
+ plainData = content;
+ }
+ Map<String, String> openapiResult1 = JSON.parseObject(plainData,
+ new TypeReference<Map<String, String>>() {
+ }, Feature.OrderedField);
-
-
+ mobile=openapiResult1.get("mobile");
}
- return appMiniLoginVO;
+ }else{
+ 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);
+ }
+ 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;
}
public static String getAccessTokenByWX() throws Exception {
@@ -410,6 +507,129 @@
return EntityUtils.toString(response.getEntity());
}
+ /**
+ * 获取会员管理分页列表
+ *
+ * @param query 会员列表查询对象
+ * @return PageDTO<MgtMemberVO>
+ */
+ @Override
+ public PageDTO<MgtMemberVO> getMemberPage(MgtMemberQuery query) {
+ Page<Member> page = this.lambdaQuery()
+ .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());
+ }
+ return PageDTO.of(page, MgtMemberVO.class);
+ }
+
+ @Override
+ public void updMembeOne(updMembeOneDTO dMembeOneDTO) {
+ Member byId = this.getById(dMembeOneDTO.getMemberId());
+ if (dMembeOneDTO.getMoney()!=null){
+ if (dMembeOneDTO.getType()==1){
+ BigDecimal big=byId.getMoney().add(dMembeOneDTO.getMoney());
+ byId.setMoney(big);
+ }else {
+ BigDecimal big=byId.getMoney().subtract(dMembeOneDTO.getMoney());
+ byId.setMoney(big);
+ }
+ } if (dMembeOneDTO.getTotalPoints()!=null){
+ if (dMembeOneDTO.getType()==1){
+ Integer big=byId.getTotalPoints()+dMembeOneDTO.getTotalPoints();
+ byId.setTotalPoints(big);
+ }else {
+ Integer big=byId.getTotalPoints()-dMembeOneDTO.getTotalPoints();
+ byId.setTotalPoints(big);
+ }
+ }
+ this.updateById(byId);
+ LambdaQueryWrapper<MemberLevel> wrapper= Wrappers.lambdaQuery();
+ List<MemberLevel> list = memberLevelMapper.selectList(wrapper);
+ 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;
+ }
+
+ /**
+ * 获取用户详情
+ *
+ * @param id 会员id
+ * @return MgtMemberVO
+ */
+ @Override
+ public MgtMemberVO getMemberById(Long id) {
+ Member member = this.getById(id);
+ if (StringUtils.isNull(member)) {
+ throw new ServiceException("会员不存在");
+ }
+ return BeanUtils.copyBean(member, MgtMemberVO.class);
+ }
+
+ /**
+ * 获取积分明细分页列表
+ *
+ * @param query 会员积分明细查询对象
+ * @return PageDTO<MgtMemberPointsVO>
+ */
+ @Override
+ public PageDTO<MgtMemberPointsVO> getMemberPoints(MgtMemberPointsQuery query) {
+ Page<MemberPoints> page = memberPointsService.lambdaQuery()
+ .eq(MemberPoints::getMemberId, query.getId())
+ .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ if (StringUtils.isEmpty(page.getRecords())) {
+ return PageDTO.empty(page);
+ }
+ return PageDTO.of(page, MgtMemberPointsVO.class);
+ }
+
+ @Override
+ public List<Member> getMemberListByCondition(MemberDTO memberDTO) {
+ return this.lambdaQuery()
+ .like(StringUtils.isNotBlank(memberDTO.getNickname()), Member::getNickname,
+ memberDTO.getNickname())
+ .like(StringUtils.isNotBlank(memberDTO.getRealName()), Member::getRealName,
+ memberDTO.getRealName())
+ .like(StringUtils.isNotBlank(memberDTO.getPhone()), Member::getPhone,
+ memberDTO.getPhone()).list();
+ }
+
+ @Override
+ public List<Member> getMemberListByLevel(List<String> memberLevelList) {
+ return this.lambdaQuery()
+ .in(StringUtils.isNotEmpty(memberLevelList), Member::getLevel, memberLevelList)
+ .orderByDesc(Member::getLevel)
+ .list();
+ }
+
+
}
--
Gitblit v1.7.1