From 5f159dab33dce77f05472b16045ab6ca4f48d07b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 12 五月 2023 16:49:39 +0800
Subject: [PATCH] DEMO完成
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 19 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 fe33958..13f5a73 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
@@ -14,12 +14,14 @@
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.pojo.member.MemberNurse;
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.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;
@@ -27,6 +29,7 @@
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.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;
@@ -38,6 +41,7 @@
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;
@@ -90,6 +94,9 @@
@Resource
private MemberNurseService memberNurseService;
+ @Resource
+ private RemoteConfigService remoteConfigService;
+
/**
* @description: TODO
* @author jqs34
@@ -135,20 +142,25 @@
sysUser = new SysUser();
sysUser.setUserName(memberId);
sysUser.setUserType("03");
- sysUser.setNickName("微信用户");
+ 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());
+ 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.setRelationShopId(1L);
member.setWxUnionid(unionid);
member.setMiniOpenid(openid);
member.setBindingFlag(0);
member.setCreateTime(new Date());
- this.save(member);
+ log.info("member-----------------"+member.toString());
+ this.saveOrUpdate(member);
}else{
log.info("member2"+member.toString());
@@ -224,16 +236,23 @@
} catch (Exception e) {
e.printStackTrace();
}
- //更新用户手机信息
- SysUser sysUser = new SysUser();
- sysUser.setUserId(appUserAuthorizeDto.getUserId());
- sysUser.setPhonenumber(mobile);
- sysUserService.updateUserMobile(sysUser);
+
+ SysUser sysUser1 = sysUserService.getSysUserBYmobile(mobile).getData();
+ if(sysUser1!=null){
+ member.setUserId(sysUser1.getUserId());
+ member.setNickName(sysUser1.getNickName());
+ }else{
+ //更新用户手机信息
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(appUserAuthorizeDto.getUserId());
+ sysUser.setPhonenumber(mobile);
+ sysUserService.updateUserMobile(sysUser);
+ member.setNickName(sysUser.getNickName());
+ }
member.setMobile(mobile);
- member.setRealName(sysUser.getNickName());
this.saveOrUpdate(member);
appUserAuthorizeVo.setMobile(mobile);
- appUserAuthorizeVo.setNickName(sysUser.getNickName());
+ appUserAuthorizeVo.setNickName(member.getNickName());
appUserAuthorizeVo.setOpenid(member.getMiniOpenid());
appUserAuthorizeVo.setUnionid(member.getWxUnionid());
return appUserAuthorizeVo;
@@ -269,20 +288,20 @@
@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());
+ appUserInfoVo.setNickName(member.getNickName());
+ appUserInfoVo.setRealName(member.getRealName());
+ appUserInfoVo.setPhonenumber(member.getMobile());
if(member.getRelationShopId()!=null){
Shop shop = shopService.getShop(member.getRelationShopId()).getData();
appUserInfoVo.setShopName(shop.getShopName());
}
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());
@@ -301,7 +320,7 @@
Member member = this.getByUserId(appEditUserDto.getUserId());
switch (editType){
case 1:
- member.setRealName(editValue);
+ member.setNickName(editValue);
member.setUpdateTime(new Date());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
@@ -347,12 +366,12 @@
@Override
public MerMemberInfoVo getMerMemberInfo(Long userId){
MerMemberInfoVo merMemberInfoVo = new MerMemberInfoVo();
- SysUser sysUser = sysUserService.getSysUser(userId).getData();
Member member = this.getByUserId(userId);
merMemberInfoVo.setUserId(userId);
- merMemberInfoVo.setNickName(sysUser.getNickName());
- merMemberInfoVo.setPhonenumber(sysUser.getPhonenumber());
- merMemberInfoVo.setAvatar(sysUser.getAvatar());
+ merMemberInfoVo.setNickName(member.getNickName());
+ merMemberInfoVo.setPhonenumber(member.getMobile());
+ merMemberInfoVo.setAvatar(member.getAvatar());
+ merMemberInfoVo.setBirthday(member.getBirthday());
//未完成
return merMemberInfoVo;
@@ -393,9 +412,56 @@
MerMemberBasicFileVo merMemberBasicFileVo = new MerMemberBasicFileVo();
Member member = this.getByUserId(userId);
BeanUtils.copyProperties(member, merMemberBasicFileVo);
+ merMemberBasicFileVo.setNickName(member.getNickName());
+ merMemberBasicFileVo.setPhonenumber(member.getMobile());
+ merMemberBasicFileVo.setCreateTime(member.getCreateTime());
List<MemberNurse> memberNurseList = memberNurseService.listByUserId(userId);
List<String> valueList = memberNurseList.stream().map(k->k.getNurse()).collect(Collectors.toList());
merMemberBasicFileVo.setMemberNurse(valueList);
return merMemberBasicFileVo;
}
+
+ /**
+ *
+ * @param userId
+ * @return
+ */
+ @Override
+ public List<MerMemberTagVo> getMerMemberTags(Long userId){
+ Member member = this.getByUserId(userId);
+ String userTags = member.getUserTags();
+ String[] userTagsArr = null;
+ if(StringUtils.isNotBlank(userTags)){
+ userTagsArr = userTags.split(",");
+ }
+ List<SysTag> sysTagsList = remoteConfigService.listSysTag(1).getData();
+ List<MerMemberTagVo> merMemberTagVoList = new ArrayList<>();
+ MerMemberTagVo merMemberTagVo;
+ String tagName;
+ if(sysTagsList!=null&&!sysTagsList.isEmpty()){
+ for(SysTag sysTag : sysTagsList){
+ merMemberTagVo = new MerMemberTagVo();
+ tagName = sysTag.getTagName();
+ merMemberTagVo.setTagName(tagName);
+ if(userTagsArr!=null && ArrayUtils.contains(userTagsArr, tagName)){
+ merMemberTagVo.setSelectFlag(1);
+ }else{
+ merMemberTagVo.setSelectFlag(0);
+ }
+ merMemberTagVoList.add(merMemberTagVo);
+ }
+ }
+ return merMemberTagVoList;
+ }
+
+ /**
+ *
+ * @param merMemberTagEditDto
+ */
+ @Override
+ public void editMerMemberTags(MerMemberTagEditDto merMemberTagEditDto){
+ Member member = this.getByUserId(merMemberTagEditDto.getMemberUserId());
+ member.setUserTags(merMemberTagEditDto.getUserTags());
+ this.saveOrUpdate(member);
+ }
}
--
Gitblit v1.7.1