Skip to content

S
shop-Mall
Commit 9c951d26 authored by licc's avatar licc
Browse files
Options

设置页面邀请码填写接口 提交

parent 5e85fda9
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 45 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @ 9c951d26
......@@ -115,6 +115,12 @@ public interface UsersMapper extends BaseMapper<User> {
* @param inviteCode 用户本人的邀请码
* @return 所有填写此人的邀请码的用户
*/
List<User> getByInviteCode(@Param("inviteCode") String inviteCode, @Param("userlevel") int userLevel);
List<User> getByInviteCode(@Param("inviteCode") String inviteCode, @Param("userLevel") int userLevel);
/**
* 通过邀请码，获取用户信息
* @param inviteCode 邀请码
* @return 用户信息
*/
User queryByInviteCode(@Param("inviteCode") String inviteCode);
}
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ 9c951d26
......@@ -288,6 +288,17 @@
<!-- 获取当前用户的所有直接推荐人-->
<select id="getByInviteCode" resultType="cn.wisenergy.model.app.User" parameterType="string">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
be_invited_code=#{inviteCode}
and user_level=#{userLevel}
</where>
</select>
<select id="queryByInviteCode" resultType="cn.wisenergy.model.app.User">
select
<include refid="cols_all"/>
from
......@@ -295,7 +306,6 @@
<where>
be_invited_code=#{inviteCode}
</where>
and user_level=#{userlevel}
</select>
<update id="updateByUserid">
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @ 9c951d26
......@@ -7,26 +7,28 @@ import cn.wisenergy.model.vo.AerialDeliveryVo;
import java.util.Map;
/**
* @author 86187
* @author 86187
* @ Description: 用户接口
* @ Author : 86187
* @ Date : 2021/1/6 16:08
* @author 86187
*/
public interface UserService {
/**
* 获取用户信息
*
* @param userId 用户id
* @return 用户信息
*/
User getById(String userId);
User getById(String userId);
R<Integer> getById1(String userId);
R<Integer> getById1(String userId);
/**
* 获取用户信息
*
* @param userId 用户id
* @return 用户信息
*/
......@@ -36,13 +38,14 @@ public interface UserService {
* 根据手机号查询用户
*/
User queryUsersByPhone(String userId);
/**
* 根据OpenId查询用户
*/
User queryUsersByOpenId(String openId);
/**
*用户注册
* 用户注册
*/
Map userByZx(String userId, String beInvitedCode);
......@@ -51,15 +54,26 @@ public interface UserService {
/**
* 空投池
*
* @return 用户列表信息
*/
R<AerialDeliveryVo> queryAerialDelivery();
/**
* 设置用户头像
* @param userId 用户id
*
* @param userId 用户id
* @param headImage 头像地址url
* @return true or false
*/
R<Boolean> setHeadImage(String userId, String headImage);
/**
* 填写设置页面-邀请码
*
* @param userId 用户id
* @param inviteCode 邀请码
* @return true or false
*/
R<Boolean> fillInInviteCode(String userId, String inviteCode);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ 9c951d26
......@@ -52,7 +52,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Override
public R<Integer> getById1(String userId) {
return R.ok(usersMapper.ByUserId(userId));
return R.ok(usersMapper.ByUserId(userId));
}
@Override
......@@ -63,14 +63,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Override
public User queryUsersByPhone(String userId) {
Map<String,Object> param=new HashMap<String, Object>();
param.put("userId",userId);
List<User> usersList=usersMapper.getUsersListByMap(param);
if(!CollectionUtils.isEmpty(usersList)){
Map<String, Object> param = new HashMap<String, Object>();
param.put("userId", userId);
List<User> usersList = usersMapper.getUsersListByMap(param);
if (!CollectionUtils.isEmpty(usersList)) {
return usersList.get(0);
}
// return ResultUtils.returnFail("","");
return null;
return null;
}
@Override
......@@ -83,35 +83,35 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//查询数据库，看看是否存在该用户
// Integer yh=usersMapper.getuserIdById(userId);
User byUserId = usersMapper.getByUserId(userId);
if(null != byUserId){
R.error(0,"该用户已存在！请直接登录！") ;
Map map=new HashMap();
map.put("code",0);
map.put("msg","该用户已存在！请直接登录！");
if (null != byUserId) {
R.error(0, "该用户已存在！请直接登录！");
Map map = new HashMap();
map.put("code", 0);
map.put("msg", "该用户已存在！请直接登录！");
return map;
}
/**
* 判断用户推荐人的邀请码是否为空，空的话填写1
*/
if (null == beInvitedCode || "" == beInvitedCode ) {
if (null == beInvitedCode || "" == beInvitedCode) {
beInvitedCode = "1";
// 插入用户手机号与推荐人邀请码
usersMapper.insertbyint(userId, beInvitedCode);
}else if("1".equals(beInvitedCode)){
} else if ("1".equals(beInvitedCode)) {
//用户的被邀请码，查询到推荐人用户，根据推荐人用户的邀请码查询/修改
User user=usersMapper.getByBeInvitedCode(beInvitedCode);
User user = usersMapper.getByBeInvitedCode(beInvitedCode);
int ida = user.getId();
// 邀请人的被邀请码
String byqm= user.getBeInvitedCode();
String byqm = user.getBeInvitedCode();
// 通过被邀请码，比对本人邀请码查询本人id
int idb=usersMapper.beInvitedCode1(beInvitedCode);
int idb = usersMapper.beInvitedCode1(beInvitedCode);
//判断被邀请用户的创建时间是否比推荐人的用户时间晚
if(idb<ida){
Map map=new HashMap();
R.error(1,"注册失败！邀请码无效,请重新填写！");
map.put("code:",1);
map.put("msg:","注册失败！邀请码无效,请重新填写！");
if (idb < ida) {
Map map = new HashMap();
R.error(1, "注册失败！邀请码无效,请重新填写！");
map.put("code:", 1);
map.put("msg:", "注册失败！邀请码无效,请重新填写！");
return map;
}
......@@ -124,7 +124,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
long yqm = usersMapper.getuserIdById(userId);
//用户唯一ID调用生成6位邀请码
String inviteCode = ShareCodeUtil.idToCode(yqm);
Integer userLevel=0;
Integer userLevel = 0;
//根据用户手机号，更新用户信息
// usersMapper.edit1(userLevel,inviteCode,userId);
User byUserId1 = usersMapper.getByUserId(userId);
......@@ -133,12 +133,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
usersMapper.edit(byUserId1);
String BYQM= String.valueOf(usersMapper.BYQMById(userId));
String BYQM = String.valueOf(usersMapper.BYQMById(userId));
if("1".equals(BYQM)){
Map map =new HashMap();
map.put("code",0);
map.put("msg","注册成功！");
if ("1".equals(BYQM)) {
Map map = new HashMap();
map.put("code", 0);
map.put("msg", "注册成功！");
return map;
}
//插入直推用户表
......@@ -162,18 +162,18 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//更新直推表用户数据
recommendUserMapper.updateById(recommendUser);
} else {
Map map=new HashMap();
R.error(1,"注册失败！验证码无效,请重新填写！");
map.put("code:",1);
map.put("msg:","注册失败！验证码无效,请重新填写！");
Map map = new HashMap();
R.error(1, "注册失败！验证码无效,请重新填写！");
map.put("code:", 1);
map.put("msg:", "注册失败！验证码无效,请重新填写！");
return map;
}
//递归向上修改团队用户信息表
teamgg(beInvitedCode);
Map map=new HashMap();
R.ok("直推表普通用户数量+1成功！",0);
map.put("code:",0);
map.put("msg:","直推表普通用户数量+1成功");
Map map = new HashMap();
R.ok("直推表普通用户数量+1成功！", 0);
map.put("code:", 0);
map.put("msg:", "直推表普通用户数量+1成功");
return map;
}
......@@ -230,6 +230,39 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
return R.ok(0, true);
}
@Override
public R<Boolean> fillInInviteCode(String userId, String inviteCode) {
log.info("shop-mall[]UserServiceImpl[]fillInInviteCode[]input.param.userId,inviteCode:" + userId, inviteCode);
if (StringUtils.isBlank(userId) || StringUtils.isBlank(inviteCode)) {
return R.error("入参不能为空!");
}
//1、获取用户信息
User user = usersMapper.getByUserId(userId);
if (null == user) {
return R.error("用户信息不存在!");
}
//2、根据邀请码，获取邀请人信息
User userCode = usersMapper.queryByInviteCode(inviteCode);
if (null == userCode) {
return R.error("邀请人信息不存在!");
}
//3、判断邀请人的注册时间是否大于当前用户
if (user.getCreateTime().getTime() > userCode.getCreateTime().getTime()) {
return R.error("请填写注册时间大于自己的用户邀请码!");
}
//4、设置用户被邀请码
user.setBeInvitedCode(inviteCode);
int count = usersMapper.edit(user);
if (count == 0) {
return R.ok(1, false);
}
return R.ok(0, true);
}
//私有构造方法-传入被邀请码
private R teamgg(String beInvitedCode) {
//用户的被邀请码，查询到推荐人用户，根据推荐人用户的邀请码查询/修改
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
View file @ 9c951d26
......@@ -135,7 +135,7 @@ public class UserController extends BaseController {
@ApiOperation(value = "查询空投池信息", notes = "查询空投池信息", httpMethod = "GET")
@GetMapping("/queryAerialDelivery")
public R<AerialDeliveryVo> queryAerialDelivery() {
log.info("shop-mall[]UserController[]queryAerialDelivery[]input.method" );
log.info("shop-mall[]UserController[]queryAerialDelivery[]input.method");
return userService.queryAerialDelivery();
}
......@@ -147,13 +147,28 @@ public class UserController extends BaseController {
@ApiImplicitParam(name = "headImage", value = "头像Url", dataType = "String")
})
@PostMapping("/setHeadImage")
public R<Boolean> setHeadImage(String userId,String headImage) {
public R<Boolean> setHeadImage(String userId, String headImage) {
log.info("shop-mall[]UserController[]setHeadImage[]input.param.userId,headImage:" + userId, headImage);
if (StringUtils.isBlank(userId) || StringUtils.isBlank(headImage)) {
return R.error("入参不能为空!");
}
return userService.setHeadImage(userId,headImage);
return userService.setHeadImage(userId, headImage);
}
@ApiOperation(value = "设置页面-邀请码填写", notes = "设置页面-邀请码填写", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "用户id", dataType = "String"),
@ApiImplicitParam(name = "inviteCode", value = "邀请码", dataType = "String")
})
@PostMapping("/fillInInviteCode")
public R<Boolean> fillInInviteCode(String userId, String inviteCode) {
log.info("shop-mall[]UserController[]fillInInviteCode[]input.param.userId,inviteCode:" + userId, inviteCode);
if (StringUtils.isBlank(userId) || StringUtils.isBlank(inviteCode)) {
return R.error("入参不能为空!");
}
return userService.fillInInviteCode(userId, inviteCode);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment