From c5a7635e5fb5f69b1c171e42267083206e137b3d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 14:22:00 +0800
Subject: [PATCH] refactor(mall): 优化会员添加流程
---
src/main/resources/templates/febs/views/modules/mallMember/addMember.html | 6 ------
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 23 ++++++++++++++++-------
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 1 +
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index 68ab486..3a5d730 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -399,6 +399,7 @@
registerDto.setAccount(member.getAccount());
registerDto.setRegistType("admin");
registerDto.setPassword("a123456");
+ registerDto.setPasswordAgain("a123456");
registerDto.setInviteId(member.getInviteId());
apiMallMemberService.register(registerDto);
return new FebsResponse().success();
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 9ebc69e..447cefe 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -130,14 +130,23 @@
//对于邀请码的验证和上级联系人的验证
Integer count = this.baseMapper.selectCount(null);
if (count != null && count != 0) {
- if(!StrUtil.isEmpty(registerDto.getInviteId())){
- String inviteId = registerDto.getInviteId();
- MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
- if (inviteMember == null) {
- throw new FebsException("邀请码不存在");
- }
- mallMember.setReferrerId(registerDto.getInviteId());
+ if(StrUtil.isEmpty(registerDto.getInviteId())){
+ throw new FebsException("请输入邀请码");
}
+ String inviteId = registerDto.getInviteId();
+ MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
+ if (inviteMember == null) {
+ throw new FebsException("邀请码不存在");
+ }
+ mallMember.setReferrerId(registerDto.getInviteId());
+// if(!StrUtil.isEmpty(registerDto.getInviteId())){
+// String inviteId = registerDto.getInviteId();
+// MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
+// if (inviteMember == null) {
+// throw new FebsException("邀请码不存在");
+// }
+// mallMember.setReferrerId(registerDto.getInviteId());
+// }
}
mallMember.setName(account);
mallMember.setAvatar("https://res.runstep.cc/rslogo.png");
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/addMember.html b/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
index 55344f8..5895b9d 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
@@ -29,12 +29,6 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">姓名：</label>
- <div class="layui-input-block">
- <input type="text" name="name" lay-verify="required" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">推荐人：</label>
<div class="layui-input-block">
<input type="text" name="inviteId" lay-verify="required" autocomplete="off" class="layui-input">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 438caed..0804388 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -89,6 +89,7 @@
</style>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">碳币拨付</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">碳积分拨付</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">登录密码重置</button>
--
Gitblit v1.9.1