From aed4e4c7d76de4d0fbfe8c0b26fcdeecbd5c5b24 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 26 五月 2023 18:04:47 +0800 Subject: [PATCH] 管理台用户管理 --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 402 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 303 insertions(+), 99 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java index 86004d0..4b092e9 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java @@ -1,55 +1,58 @@ package com.ruoyi.member.service.impl.member; +import java.util.Date; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; +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.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.bean.BeanUtils; 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.domain.dto.AppUserAuthorizeDto; -import com.ruoyi.member.domain.dto.MerCashMemberPageDto; -import com.ruoyi.member.domain.dto.MerMemberPageDto; -import com.ruoyi.member.domain.dto.MerMemberTagEditDto; +import com.ruoyi.member.domain.dto.*; import com.ruoyi.member.domain.pojo.member.MemberNurse; +import com.ruoyi.member.domain.pojo.member.MemberTotal; import com.ruoyi.member.domain.vo.*; import com.ruoyi.member.mapper.member.MemberMapper; import com.ruoyi.member.service.member.MemberNurseService; import com.ruoyi.member.service.member.MemberService; +import com.ruoyi.member.service.member.MemberTotalService; +import com.ruoyi.member.util.CodeFactoryUtil; import com.ruoyi.member.util.HttpUtils; -import com.ruoyi.system.api.RemoteConfigService; -import com.ruoyi.system.api.RemoteOrderService; -import com.ruoyi.system.api.RemoteShopService; -import com.ruoyi.system.api.RemoteUserService; +import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto; +import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo; +import com.ruoyi.system.api.service.RemoteConfigService; +import com.ruoyi.system.api.service.RemoteOrderService; +import com.ruoyi.system.api.service.RemoteShopService; +import com.ruoyi.system.api.service.RemoteUserService; import com.ruoyi.system.api.constant.AppErrorConstant; import com.ruoyi.system.api.constant.SecurityConstant; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.dto.AppMemberBindingDto; +import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto; import com.ruoyi.system.api.domain.poji.config.SysTag; import com.ruoyi.system.api.domain.poji.member.Member; import com.ruoyi.system.api.domain.poji.shop.Shop; import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.domain.vo.AppOrderTotalVo; -import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo; import com.ruoyi.system.api.model.AppMiniLoginDto; import com.ruoyi.system.api.model.AppMiniLoginVo; -import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j2; -import lombok.val; import com.ruoyi.common.core.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -83,9 +86,6 @@ private MemberMapper memberMapper; @Resource - private StringRedisTemplate stringRedisTemplate; - - @Resource private RemoteShopService shopService; @Resource @@ -96,6 +96,12 @@ @Resource private RemoteConfigService remoteConfigService; + + @Resource + private RedisService redisService; + + @Resource + private MemberTotalService memberTotalService; /** * @description: TODO @@ -135,79 +141,37 @@ sessionKey = session.getSessionKey(); //获取用户 Member member = memberMapper.getOneByMiniOpenid(openid); - SysUser sysUser; - if(member==null){ - //创建新用户 - String memberId = IdUtils.simpleUUID(); - sysUser = new SysUser(); - sysUser.setUserName(memberId); - sysUser.setUserType("03"); - sysUser.setNickName("鸿瑞堂用户"); - sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); - String password = "hongruitang"; - sysUser.setPassword(SecurityUtils.encryptPassword(password)); - sysUser = sysUserService.registerUser(sysUser).getData(); - log.info("sysUser1"+sysUser.toString()); - member = new Member(); - member.setUserId(sysUser.getUserId()); - member.setDelFlag(0); - member.setNickName("鸿瑞堂用户"); - member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); - member.setMemberId(memberId); - member.setWxUnionid(unionid); - member.setMiniOpenid(openid); - member.setBindingFlag(0); - member.setCreateTime(new Date()); - this.save(member); - - }else{ - log.info("member2"+member.toString()); - R<SysUser> sysUser1 = sysUserService.getSysUser(member.getUserId()); - log.info("sysUser1"+ sysUser1.getCode() + " : " + sysUser1.getMsg()); - sysUser = sysUser1.getData(); - log.info("sysUser"+sysUser.toString()); + SysUser sysUser = null; + if(member!=null){ + sysUser = sysUserService.getSysUser(member.getUserId()).getData(); } appMiniLoginVo.setMiniOpenid(openid); appMiniLoginVo.setWxUnionid(unionid); appMiniLoginVo.setSysUser(sysUser); appMiniLoginVo.setSessionKey(sessionKey); - stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey); - }else{ - log.info("null"); - return null; + redisService.setCacheObject(SecurityConstant.SESSION_KEY+openid,sessionKey,1L,TimeUnit.DAYS); } log.info("appMiniLoginVo"+appMiniLoginVo.toString()); return appMiniLoginVo; } /** - * 获取授权信息 - * @param appUserAuthorizeDto + * 小程序注册 + * @param appUserRegisterDto * @return */ @Override - public AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto){ - Member member = this.getById(appUserAuthorizeDto.getUserId()); - AppUserAuthorizeVo appUserAuthorizeVo = new AppUserAuthorizeVo(); + public AppMiniRegisterVo miniRegister(AppMiniRegisterDto appUserRegisterDto){ + AppMiniRegisterVo appUserRegisterVo = new AppMiniRegisterVo(); + String mobile = null; //获取code接口在redis里存放的sessionkey用于解密 - String sessionkey = stringRedisTemplate.opsForValue().get(SecurityConstant.SESSION_KEY+ member.getMiniOpenid()); + String sessionkey = redisService.getCacheObject(SecurityConstant.SESSION_KEY+ appUserRegisterDto.getMiniOpenid()); if(StringUtils.isBlank(sessionkey)){ throw new ServiceException(AppErrorConstant.USER_NOT_LOGIN); } - String mobile = null; try { - //解密微信加密用户信息和手机号 - /*WxMaPhoneNumberInfo wxPhoneInfo; - if(StringUtils.isNotBlank(appUserAuthorizeDto.getPhoneEncryptedData())&&StringUtils.isNotBlank(appUserAuthorizeDto.getPhoneIv())){ - wxPhoneInfo = wxMaService.getUserService().getPhoneNoInfo(sessionkey, appUserAuthorizeDto.getPhoneEncryptedData(), appUserAuthorizeDto.getPhoneIv()); - }else{ - throw new ServiceException(AppErrorConstant.AUTHORIZE_MISS); - } - if(StringUtils.isBlank(wxPhoneInfo.getPhoneNumber())){ - throw new ServiceException(AppErrorConstant.AUTHORIZE_FAILED); - } - mobile = wxPhoneInfo.getPhoneNumber();*/ - String accessToken = stringRedisTemplate.opsForValue().get("wx_access_token"); + //获取微信token用于解密手机 + String accessToken = redisService.getCacheObject(SecurityConstant.WX_TOKEN); if (StringUtils.isBlank(accessToken)) { String responseAccessToken = getAccessTokenByWX(); JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken); @@ -218,14 +182,15 @@ throw new ServiceException(errmsg); } else { expiresIn = expiresIn - 100; - stringRedisTemplate.opsForValue().set("wx_access_token", accessToken, expiresIn.intValue(), TimeUnit.SECONDS); + redisService.setCacheObject(SecurityConstant.WX_TOKEN, accessToken, Long.valueOf(expiresIn), TimeUnit.SECONDS); } } - String responseUserPhoneNumber = getMobileByWX(accessToken, appUserAuthorizeDto.getMobileCode()); + //解密手机 + String responseUserPhoneNumber = getMobileByWX(accessToken, appUserRegisterDto.getMobileCode()); JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber); String errcode = jsonUserPhoneNumber.getString("errcode"); String errmsg = jsonUserPhoneNumber.getString("errmsg"); - if (!errcode.equals("0")) { + if (!"0".equals(errcode)) { throw new ServiceException(errmsg); } String phoneInfo = jsonUserPhoneNumber.getString("phone_info"); @@ -234,19 +199,55 @@ } catch (Exception e) { e.printStackTrace(); } - //更新用户手机信息 - SysUser sysUser = new SysUser(); - sysUser.setUserId(appUserAuthorizeDto.getUserId()); - sysUser.setPhonenumber(mobile); - sysUserService.updateUserMobile(sysUser); - member.setMobile(mobile); - member.setNickName(sysUser.getNickName()); + if(StringUtils.isBlank(mobile)){ + return null; + } + //判断openid是否被其他手机号占用 + Member checkMember = memberMapper.getOneByMiniOpenid(appUserRegisterDto.getMiniOpenid()); + if(checkMember!=null&&!checkMember.getMobile().equals(mobile)){ + throw new ServiceException("微信号换绑手机需联系客服"); + } + Member member = memberMapper.selectMemberByMobile(mobile); + SysUser sysUser; + //获取用户为空则新建 + if(member == null){ + //创建新用户 + String memberId = IdUtils.simpleUUID(); + sysUser = new SysUser(); + sysUser.setUserName(memberId); + sysUser.setUserType("03"); + sysUser.setNickName("鸿瑞堂用户"); + sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); + String password = "hongruitang"; + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + sysUser = sysUserService.registerUser(sysUser).getData(); + member = new Member(); + String memberNo = createMemberNo(); + member.setMemberNo(memberNo); + member.setUserId(sysUser.getUserId()); + member.setDelFlag(0); + member.setNickName("鸿瑞堂用户"); + member.setRealName("鸿瑞堂用户"); + member.setCustomerSource("小程序"); + member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); + member.setMemberId(memberId); + member.setBindingFlag(0); + member.setCreateTime(new Date()); + member.setMobile(mobile); + initMemberTotal(memberId); + }else{ + sysUser = sysUserService.getSysUser(member.getUserId()).getData(); + } + member.setWxUnionid(appUserRegisterDto.getWxUnionid()); + member.setMiniOpenid(appUserRegisterDto.getMiniOpenid()); + log.info("member-----------------"+member.toString()); this.saveOrUpdate(member); - appUserAuthorizeVo.setMobile(mobile); - appUserAuthorizeVo.setNickName(sysUser.getNickName()); - appUserAuthorizeVo.setOpenid(member.getMiniOpenid()); - appUserAuthorizeVo.setUnionid(member.getWxUnionid()); - return appUserAuthorizeVo; + appUserRegisterVo.setMobile(mobile); + appUserRegisterVo.setNickName(member.getNickName()); + appUserRegisterVo.setOpenid(member.getMiniOpenid()); + appUserRegisterVo.setUnionid(member.getWxUnionid()); + appUserRegisterVo.setSysUser(sysUser); + return appUserRegisterVo; } public static String getAccessTokenByWX() throws Exception { @@ -279,20 +280,21 @@ @Override public AppUserInfoVo getAppUserInfo(Long userId){ AppUserInfoVo appUserInfoVo = new AppUserInfoVo(); - SysUser sysUser = sysUserService.getSysUser(userId).getData(); Member member = this.getByUserId(userId); appUserInfoVo.setUserId(userId); - appUserInfoVo.setRelationShopId(member.getRelationShopId()); appUserInfoVo.setMemberNo(member.getMemberNo()); - appUserInfoVo.setNickName(sysUser.getNickName()); - appUserInfoVo.setPhonenumber(sysUser.getPhonenumber()); - if(member.getRelationShopId()!=null){ + appUserInfoVo.setNickName(member.getNickName()); + appUserInfoVo.setRealName(member.getRealName()); + appUserInfoVo.setPhonenumber(member.getMobile()); + if(member.getRelationShopId()!=null&&member.getBindingFlag()==1){ + appUserInfoVo.setRelationShopId(member.getRelationShopId()); Shop shop = shopService.getShop(member.getRelationShopId()).getData(); appUserInfoVo.setShopName(shop.getShopName()); + appUserInfoVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress()); } appUserInfoVo.setBirthday(member.getBirthday()); appUserInfoVo.setGender(member.getGender()); - appUserInfoVo.setAvatar(sysUser.getAvatar()); + appUserInfoVo.setAvatar(member.getAvatar()); AppOrderTotalVo appOrderTotalVo = orderService.getAppOrderTotal(userId).getData(); appUserInfoVo.setNoPayCount(appOrderTotalVo.getNoPayCount()); appUserInfoVo.setNoUseCount(appOrderTotalVo.getNoUseCount()); @@ -349,7 +351,7 @@ /** - * @description: TODO + * @description: 商户获取会员信息 * @author jqs34 * @date 2023/5/4 22:50 * @version 1.0 @@ -363,6 +365,7 @@ merMemberInfoVo.setPhonenumber(member.getMobile()); merMemberInfoVo.setAvatar(member.getAvatar()); merMemberInfoVo.setBirthday(member.getBirthday()); + merMemberInfoVo.setUserTags(member.getUserTags()); //未完成 return merMemberInfoVo; @@ -382,7 +385,7 @@ } /** - * + * 更新会员绑定商户 * @param appMemberBindingDto */ @Override @@ -390,11 +393,12 @@ Member member = this.getByUserId(appMemberBindingDto.getUserId()); member.setBindingFlag(appMemberBindingDto.getBindingFlag()); member.setRelationShopId(appMemberBindingDto.getShopId()); + member.setRelationShopName(appMemberBindingDto.getShopName()); this.saveOrUpdate(member); } /** - * + * 获取会员基础档案 * @param userId * @return */ @@ -413,7 +417,7 @@ } /** - * + * 获取会员标签 * @param userId * @return */ @@ -446,13 +450,213 @@ } /** - * + * 编辑会员标签 * @param merMemberTagEditDto */ @Override public void editMerMemberTags(MerMemberTagEditDto merMemberTagEditDto){ Member member = this.getByUserId(merMemberTagEditDto.getMemberUserId()); - member.setUserTags(merMemberTagEditDto.getUserTags()); + List<String> userTags = merMemberTagEditDto.getUserTags(); + StringJoiner sj = new StringJoiner(","); + if(userTags!=null&&!userTags.isEmpty()){ + for(String str : userTags){ + sj.add(str); + } + } + member.setUserTags(sj.toString()); this.saveOrUpdate(member); } + + + /** + * 添加会员 + * @param merMemberAddDto + */ + @Override + public void addMerMember(MerMemberAddDto merMemberAddDto){ + String phonenumber = merMemberAddDto.getPhonenumber(); + Member oldMember = this.getByMobile(phonenumber); + if(oldMember!=null){ + throw new ServiceException(AppErrorConstant.MOBILE_USER_DOUBLE); + } + SysUser sysUser = sysUserService.getSysUserByMobile(phonenumber).getData(); + if(sysUser==null){ + String memberId = IdUtils.simpleUUID(); + sysUser = new SysUser(); + sysUser.setUserName(memberId); + sysUser.setUserType("03"); + sysUser.setNickName(merMemberAddDto.getNickName()); + sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); + String password = "hongruitang"; + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + log.debug("sysUser"+sysUser.toString()); + sysUser = sysUserService.registerUser(sysUser).getData(); + Member member = new Member(); + String memberNo = createMemberNo(); + member.setMemberNo(memberNo); + member.setMemberId(memberId); + member.setUserId(sysUser.getUserId()); + member.setDelFlag(0); + member.setNickName(merMemberAddDto.getNickName()); + member.setRealName(merMemberAddDto.getNickName()); + member.setGender(merMemberAddDto.getGender()); + member.setMobile(phonenumber); + member.setReferrer(merMemberAddDto.getReferrer()); + member.setBirthday(merMemberAddDto.getBirthday()); + member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); + member.setRelationShopId(merMemberAddDto.getShopId()); + member.setWxUnionid(null); + member.setMiniOpenid(null); + member.setBindingFlag(1); + member.setRelationShopId(merMemberAddDto.getShopId()); + member.setCustomerSource("商户添加"); + member.setCreateTime(new Date()); + log.info("member-----------------"+member.toString()); + this.saveOrUpdate(member); + initMemberTotal(memberId); + } + + + } + + /** + * 编辑会员 + * @param merMemberEditDto + */ + @Override + public void editMerMember(MerMemberEditDto merMemberEditDto){ + + Member member = this.getByUserId(merMemberEditDto.getEditUserId()); + if(!member.getMobile().equals(merMemberEditDto.getPhonenumber())){ + Member memberOld = getByMobile(merMemberEditDto.getPhonenumber()); + if(memberOld!=null){ + throw new ServiceException(AppErrorConstant.MOBILE_DOUBLE); + } + } + member.setRealName(merMemberEditDto.getNickName()); + member.setMobile(merMemberEditDto.getPhonenumber()); + member.setGender(merMemberEditDto.getGender()); + member.setReferrer(merMemberEditDto.getReferrer()); + member.setCustomerSource(merMemberEditDto.getCustomerSource()); + member.setLevel(merMemberEditDto.getLevel()); + member.setBirthday(merMemberEditDto.getBirthday()); + member.setUpdateUserId(merMemberEditDto.getUserId()); + member.setUpdateTime(new Date()); + log.info("member-----------------"+member.toString()); + this.saveOrUpdate(member); + SysUser sysUser = new SysUser(); + sysUser.setUserId(merMemberEditDto.getEditUserId()); + sysUser.setPhonenumber(merMemberEditDto.getPhonenumber()); + sysUserService.updateUserMobile(sysUser); + } + + /** + * + * @param mobile + * @return + */ + @Override + public Member getByMobile(String mobile){ + LambdaQueryWrapper<Member> queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(Member::getDelFlag, 0).eq(Member::getMobile, mobile); + Member member = this.getOne(queryWrapper); + return member; + } + + /** + * 更新用户商品类型 + * @param appMemberGoodsTypeDto + */ + @Override + public void updateMemberGoodsType(AppMemberGoodsTypeDto appMemberGoodsTypeDto){ + Member member = this.getByUserId(appMemberGoodsTypeDto.getUserId()); + HashSet<String> goodsTypeSet = appMemberGoodsTypeDto.getGoodsTypeSet(); + if(member!=null){ + String goodsType = member.getGoodsType(); + Boolean change = false; + for(String str : goodsTypeSet){ + if(goodsType != null){ + if(!goodsType.contains(str)){ + goodsType = goodsType + "," + str; + change = true; + } + }else{ + goodsType = str; + change = true; + } + } + if(change){ + member.setGoodsType(goodsType); + this.saveOrUpdate(member); + } + } + } + + + /** + * 订单创建新用户 + * @param member + */ + @Override + public void createNewMember(Member member){ + String memberNo = createMemberNo(); + member.setMemberNo(memberNo); + member.setDelFlag(0); + member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png"); + member.setBindingFlag(0); + member.setCreateTime(new Date()); + member.setCustomerSource("商户订单添加"); + this.saveOrUpdate(member); + initMemberTotal(member.getMemberId()); + } + + /** + * 生成会员统计 + * @param memberId + * @return + */ + private void initMemberTotal(String memberId){ + MemberTotal memberTotal = new MemberTotal(); + memberTotal.setMemberId(memberId); + memberTotal.setDelFlag(0); + memberTotal.setTotalIntegral(0); + memberTotal.setUsedIntegral(0); + memberTotal.setUseableIntegral(0); + memberTotal.setTotalPayMoney(new BigDecimal("0.00")); + memberTotal.setTotalPayCount(0); + memberTotal.setLastPayMoney(new BigDecimal("0.00")); + memberTotal.setTotalServiceCount(0); + memberTotal.setUsedServiceCount(0); + memberTotal.setUseableServiceCount(0); + memberTotal.setTotalActivityCount(0); + memberTotal.setTotalCycleOrder(0); + memberTotal.setToltaExperienceOrder(0); + memberTotal.setTotalServiceOrder(0); + memberTotal.setTotalGoodsOrder(0); + memberTotalService.saveOrUpdate(memberTotal); + } + + /** + * 生成会员编号 + * @return + */ + private String createMemberNo(){ + int memberTotal = memberMapper.selectCount(new LambdaQueryWrapper<Member>().eq(Member::getDelFlag, 0)); + String memberNo = CodeFactoryUtil.getMemberNo(Long.valueOf(memberTotal+1)); + return memberNo; + } + + + /** + * 平台分页获取会员列表 + * @param page + * @param merMemberPageDto + * @return + */ + @Override + public List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto){ + List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto); + + return memberPageVoList; + } } -- Gitblit v1.7.1