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 | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 b5c088f..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
@@ -4,7 +4,9 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
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;
@@ -21,6 +23,7 @@
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.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
@@ -209,8 +212,9 @@
//获取用户为空则新建
if(member == null){
//创建新用户
+ String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
- sysUser.setUserName(mobile+"-3");
+ sysUser.setUserName(memberId);
sysUser.setUserType("03");
sysUser.setNickName("鸿瑞堂用户");
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
@@ -218,11 +222,13 @@
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
member = new Member();
- String memberId = IdUtils.simpleUUID();
+ 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);
@@ -387,6 +393,7 @@
Member member = this.getByUserId(appMemberBindingDto.getUserId());
member.setBindingFlag(appMemberBindingDto.getBindingFlag());
member.setRelationShopId(appMemberBindingDto.getShopId());
+ member.setRelationShopName(appMemberBindingDto.getShopName());
this.saveOrUpdate(member);
}
@@ -474,8 +481,9 @@
}
SysUser sysUser = sysUserService.getSysUserByMobile(phonenumber).getData();
if(sysUser==null){
+ String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
- sysUser.setUserName(phonenumber+"-3");
+ sysUser.setUserName(memberId);
sysUser.setUserType("03");
sysUser.setNickName(merMemberAddDto.getNickName());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
@@ -483,8 +491,9 @@
sysUser.setPassword(SecurityUtils.encryptPassword(password));
log.debug("sysUser"+sysUser.toString());
sysUser = sysUserService.registerUser(sysUser).getData();
- String memberId = IdUtils.simpleUUID();
Member member = new Member();
+ String memberNo = createMemberNo();
+ member.setMemberNo(memberNo);
member.setMemberId(memberId);
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
@@ -500,6 +509,7 @@
member.setMiniOpenid(null);
member.setBindingFlag(1);
member.setRelationShopId(merMemberAddDto.getShopId());
+ member.setCustomerSource("商户添加");
member.setCreateTime(new Date());
log.info("member-----------------"+member.toString());
this.saveOrUpdate(member);
@@ -589,10 +599,13 @@
*/
@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());
}
@@ -622,4 +635,28 @@
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