Commit cd03597d authored by liqin's avatar liqin 💬

Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

parents 952f06a4 e9904ab8
...@@ -11,7 +11,7 @@ import java.io.Serializable; ...@@ -11,7 +11,7 @@ import java.io.Serializable;
* Created by m1991 on 2021/2/28 23:08 * Created by m1991 on 2021/2/28 23:08
*/ */
@Component @Component
public class Result<T> implements Serializable { public class Result<T> implements Serializable{
public String code; public String code;
public String msg; public String msg;
...@@ -21,20 +21,17 @@ public class Result<T> implements Serializable { ...@@ -21,20 +21,17 @@ public class Result<T> implements Serializable {
/** /**
* 无参构造 * 无参构造
*/ */
public Result() { public Result() {}
}
/** /**
* 无参构造
* @param i * @param i
* @param success * @param success
* @param shopZxPage * @param shopZxPage
*/ */
public Result(int i, String success, Page shopZxPage) { public Result(int i, String success, Page shopZxPage) {}
}
/** /**
* 根据code,msg创建一个Resutl * 根据code,msg创建一个Resutl
*
* @param code * @param code
* @param msg * @param msg
*/ */
...@@ -45,7 +42,6 @@ public class Result<T> implements Serializable { ...@@ -45,7 +42,6 @@ public class Result<T> implements Serializable {
/** /**
* 根据code,msg,data创建一个Resutl * 根据code,msg,data创建一个Resutl
*
* @param code * @param code
* @param msg * @param msg
* @param data * @param data
...@@ -58,7 +54,6 @@ public class Result<T> implements Serializable { ...@@ -58,7 +54,6 @@ public class Result<T> implements Serializable {
/** /**
* 根据枚举创建一个Result * 根据枚举创建一个Result
*
* @param resultEnum * @param resultEnum
*/ */
public Result(ResultEnum resultEnum) { public Result(ResultEnum resultEnum) {
......
...@@ -104,8 +104,12 @@ public interface UsersMapper extends BaseMapper<User> { ...@@ -104,8 +104,12 @@ public interface UsersMapper extends BaseMapper<User> {
*/ */
Integer save(@Param("userId")String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel); Integer save(@Param("userId")String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel);
Integer insertbyint(@Param("userId")String userId, @Param("beInvitedCode") String beInvitedCode); Integer insertbyint(@Param("userId")String userId, @Param("beInvitedCode") String beInvitedCode);
Integer edit1(@Param("userId")String userId);
User edit1(int userLevel, String intiveCode,String userId);
Integer edit2(User user);
Integer getuserIdById(@Param("userId")String userId); Integer getuserIdById(@Param("userId")String userId);
Integer BYQMById(@Param("userId")String userId);
/** /**
* 根据userid获取获取所有的直接推荐人 * 根据userid获取获取所有的直接推荐人
* @param inviteCode 用户本人的邀请码 * @param inviteCode 用户本人的邀请码
......
...@@ -208,12 +208,22 @@ ...@@ -208,12 +208,22 @@
user_id=#{userId} user_id=#{userId}
</where> </where>
</select> </select>
<update id="edit1" parameterType="cn.wisenergy.model.app.User"> <select id="BYQMById" resultType="java.lang.Integer">
select
be_invited_code
from
<include refid="table"/>
<where>
user_id=#{userId}
</where>
</select>
<update id="edit1" >
update update
user_info user_info
<set> <set>
<if test="userLevel != null">user_level =#{userLevel},</if> <if test="userLevel != null">user_level =#{userLevel},</if>
<if test="inviteCode != null">invite_code =#{inviteCode},</if> <if test="inviteCode != null">invite_code =#{inviteCode},</if>
create_time =now(),
update_time =now() update_time =now()
</set> </set>
<where> <where>
...@@ -221,6 +231,7 @@ ...@@ -221,6 +231,7 @@
</where> </where>
</update> </update>
<!--分页查询所有用户信息 --> <!--分页查询所有用户信息 -->
<select id="getUsersListByMap" resultType="cn.wisenergy.model.app.User" parameterType="java.util.Map"> <select id="getUsersListByMap" resultType="cn.wisenergy.model.app.User" parameterType="java.util.Map">
select id as id, select id as id,
...@@ -287,5 +298,17 @@ ...@@ -287,5 +298,17 @@
and user_level=#{userlevel} and user_level=#{userlevel}
</select> </select>
<update id="updateByUserid">
update
<include refid="table"/>
set
(user_level,invite_code,)
value
(#{userLevel},#{inviteCode})
<where>
user_id=#{userId}
</where>
</update>
</mapper> </mapper>
...@@ -34,13 +34,13 @@ public interface UserService { ...@@ -34,13 +34,13 @@ public interface UserService {
User getByUserId(String userId); User getByUserId(String userId);
//根据手机号查询用户 //根据手机号查询用户
public User queryUsersByPhone(String id); public User queryUsersByPhone(String userId);
//根据OpenId查询用户 //根据OpenId查询用户
public User queryUsersByOpenId(String openId); public User queryUsersByOpenId(String openId);
/** /**
* 用户注册 *用户注册
*/ */
Map userByZx(String userId, String beInvitedCode); Map userByZx(String userId, String beInvitedCode);
......
...@@ -60,11 +60,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U ...@@ -60,11 +60,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Override @Override
public User queryUsersByPhone(String phone) { public User queryUsersByPhone(String userId) {
Map<String, Object> param = new HashMap<String, Object>(); Map<String,Object> param=new HashMap<String, Object>();
param.put("phone", phone); param.put("userId",userId);
List<User> usersList = usersMapper.getUsersListByMap(param); List<User> usersList=usersMapper.getUsersListByMap(param);
if (!CollectionUtils.isEmpty(usersList)) { if(!CollectionUtils.isEmpty(usersList)){
return usersList.get(0); return usersList.get(0);
} }
return null; return null;
...@@ -78,11 +78,19 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U ...@@ -78,11 +78,19 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Override @Override
public Map userByZx(String userId, String beInvitedCode) { public Map userByZx(String userId, String beInvitedCode) {
//查询数据库,看看是否存在该用户 //查询数据库,看看是否存在该用户
Integer yh=usersMapper.getuserIdById(userId); // 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","该用户已存在!请直接登录!");
return map;
}
/** /**
* 判断用户推荐人的邀请码是否为空,空的话填写1 * 判断用户推荐人的邀请码是否为空,空的话填写1
*/ */
if (null == beInvitedCode || "".equals(beInvitedCode) && null==yh) { if (null == beInvitedCode || "" == beInvitedCode ) {
beInvitedCode = "1"; beInvitedCode = "1";
// 插入用户手机号与推荐人邀请码 // 插入用户手机号与推荐人邀请码
...@@ -110,16 +118,26 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U ...@@ -110,16 +118,26 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
} }
//根据插入的用户手机号,查询用户唯一ID //根据插入的用户手机号,查询用户唯一ID
long yqm = usersMapper.ByUserId(userId); long yqm = usersMapper.getuserIdById(userId);
//用户唯一ID调用生成6位邀请码 //用户唯一ID调用生成6位邀请码
String inviteCode = ShareCodeUtil.idToCode(yqm); String inviteCode = ShareCodeUtil.idToCode(yqm);
Integer userLevel=0;
//根据用户手机号,更新用户信息 //根据用户手机号,更新用户信息
User user = new User(); // usersMapper.edit1(userLevel,inviteCode,userId);
user.setInviteCode(inviteCode); User byUserId1 = usersMapper.getByUserId(userId);
user.setUserLevel(0); byUserId1.setInviteCode(inviteCode);
user.setUserId(userId); byUserId1.setUserLevel(0);
usersMapper.updateById(user);
usersMapper.edit(byUserId1);
String BYQM= String.valueOf(usersMapper.BYQMById(userId));
if("1".equals(BYQM)){
Map map =new HashMap();
map.put("code",0);
map.put("msg","注册成功!");
return map;
}
//插入直推用户表 //插入直推用户表
RecommendUser recommendUser = new RecommendUser(); RecommendUser recommendUser = new RecommendUser();
recommendUser.setUserId(userId); recommendUser.setUserId(userId);
......
...@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/** /**
* *
...@@ -35,8 +36,8 @@ public class LoginController { ...@@ -35,8 +36,8 @@ public class LoginController {
@Autowired @Autowired
private UserService usersService; private UserService usersService;
@Autowired // @Autowired
private Result result; // private Result result;
/** /**
* 手机登录接口 * 手机登录接口
...@@ -109,7 +110,7 @@ public class LoginController { ...@@ -109,7 +110,7 @@ public class LoginController {
@ApiImplicitParam(name = "sms", value = "验证码",required = true, dataType = "String") @ApiImplicitParam(name = "sms", value = "验证码",required = true, dataType = "String")
}) })
@RequestMapping("/register") @RequestMapping("/register")
public Result register(@RequestParam String userId, String beInvitedCode,@RequestParam String sms)throws Exception { public Map register(@RequestParam String userId, String beInvitedCode, @RequestParam String sms)throws Exception {
User users=null; User users=null;
String key= StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX,Constants.RedisKey.SMS_PRIFIX,userId,Constants.Sms.CodeType.LOGIN_OR_REGISTER+""); String key= StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX,Constants.RedisKey.SMS_PRIFIX,userId,Constants.Sms.CodeType.LOGIN_OR_REGISTER+"");
String redisCode=redisUtils.getValue(key); String redisCode=redisUtils.getValue(key);
...@@ -125,9 +126,8 @@ public class LoginController { ...@@ -125,9 +126,8 @@ public class LoginController {
// if(userId.equals())){ // if(userId.equals())){
// throw new BaseException(ResultEnum.PHONE_ERROR); // throw new BaseException(ResultEnum.PHONE_ERROR);
// } // }
usersService.userByZx(userId,beInvitedCode);
return ResultUtils.returnFail("注册成功!","0"); return usersService.userByZx(userId,beInvitedCode);
} }
} }
......
...@@ -69,8 +69,8 @@ public class SmsController { ...@@ -69,8 +69,8 @@ public class SmsController {
//生成随机数 //生成随机数
String code= MathUtils.random(); String code= MathUtils.random();
//保存至Redis //保存至Redis MINUTE_INT
redisUtils.set(key,code,Constants.Duration.MINUTE_INT); redisUtils.set(key,code,Constants.Duration.HALF_HOUR_INT);
boolean flag=smsUtils.sendMessage(phone,Constants.Sms.TemplateCode.LOGIN_SF_REGISTER,code); boolean flag=smsUtils.sendMessage(phone,Constants.Sms.TemplateCode.LOGIN_SF_REGISTER,code);
return flag? ResultUtils.returnSuccess():ResultUtils.returnFail(); return flag? ResultUtils.returnSuccess():ResultUtils.returnFail();
......
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