会员注册接口参数校验
无手机号会员添加手机号接口 重置资金密码 增加参数 判断手机号是会员还是用户
This commit is contained in:
@@ -65,9 +65,20 @@ public class UserContoller {
|
||||
|
||||
@PostMapping("/openMember")
|
||||
public Result openMember(@RequestBody OpenMemberVo memberVo){
|
||||
if(StringUtils.isBlank(memberVo.getTelephone())){
|
||||
return Result.fail("手机号不可为空");
|
||||
}
|
||||
return userService.openMember(memberVo);
|
||||
}
|
||||
|
||||
@PostMapping("/upVipPhont")
|
||||
public Result upVipPhont(@RequestBody OpenMemberVo memberVo){
|
||||
if(StringUtils.isBlank(memberVo.getTelephone())){
|
||||
return Result.fail("手机号不可为空");
|
||||
}
|
||||
return userService.upVipPhont(memberVo);
|
||||
}
|
||||
|
||||
@GetMapping("/shopUserInfo")
|
||||
public Result shopUserInfo(@RequestParam("userId") String userId, @RequestHeader("openId") String openId, @RequestParam("shopId") String shopId) throws Exception {
|
||||
if(shopId.equals("undefined")){
|
||||
|
||||
@@ -6,10 +6,8 @@ import lombok.Data;
|
||||
public class OpenMemberVo {
|
||||
private Integer id;
|
||||
private Integer shopId;
|
||||
private String headImg;
|
||||
|
||||
private String nickName;
|
||||
|
||||
private String telephone;
|
||||
private String nickName;
|
||||
private String birthDay;
|
||||
private String headImg;
|
||||
}
|
||||
|
||||
@@ -537,21 +537,23 @@ public class LoginService {
|
||||
) {
|
||||
return Result.fail("参数错误");
|
||||
}
|
||||
|
||||
TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
|
||||
boolean flag = validate(map.get("code").toString(), userInfo.getTelephone());
|
||||
if (!flag) {
|
||||
return Result.fail("验证码错误");
|
||||
String phone = userInfo.getTelephone();
|
||||
if (map.containsKey("vipId")) {
|
||||
TbShopUser tbShopUser = tbShopUserMapper.selectByPrimaryKey(map.get("vipId").toString());
|
||||
phone = tbShopUser.getTelephone();
|
||||
}
|
||||
if (StringUtils.isBlank(phone)) return Result.fail("设置密码失败,手机号获取为空");
|
||||
|
||||
boolean flag = validate(map.get("code").toString(), phone);
|
||||
|
||||
if (!flag) return Result.fail("验证码错误");
|
||||
|
||||
userInfo.setIsPwd("1");
|
||||
userInfo.setPwd(MD5Utils.md5(map.get("pwd").toString()));
|
||||
userInfo.setUpdatedAt(System.currentTimeMillis());
|
||||
tbUserInfoMapper.updateByPrimaryKey(userInfo);
|
||||
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -581,11 +583,4 @@ public class LoginService {
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
for (int i = 0; i < 10; i++) {
|
||||
System.out.println(RandomUtil.randomNumbers(10));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.chaozhanggui.system.cashierservice.service;
|
||||
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.extra.qrcode.QrConfig;
|
||||
@@ -21,6 +22,7 @@ import com.chaozhanggui.system.cashierservice.wxUtil.WxAccountUtil;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.core.io.Resource;
|
||||
@@ -271,25 +273,46 @@ public class UserService {
|
||||
}
|
||||
|
||||
public Result openMember(OpenMemberVo memberVo) {
|
||||
TbUserInfo userInfo = new TbUserInfo();
|
||||
userInfo.setId(memberVo.getId());
|
||||
userInfo.setHeadImg(memberVo.getHeadImg());
|
||||
userInfo.setNickName(memberVo.getNickName());
|
||||
userInfo.setTelephone(memberVo.getTelephone());
|
||||
userInfo.setBirthDay(memberVo.getBirthDay());
|
||||
userInfoMapper.updateByPrimaryKeySelective(userInfo);
|
||||
List<TbShopUser> tbShopUsers = shopUserMapper.selectAllByUserId(memberVo.getId().toString());
|
||||
for (TbShopUser tbShopUser : tbShopUsers) {
|
||||
tbShopUser.setTelephone(memberVo.getTelephone());
|
||||
shopUserMapper.updateByPrimaryKey(tbShopUser);
|
||||
}
|
||||
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
|
||||
tbShopUser.setName(memberVo.getNickName());
|
||||
tbShopUser.setHeadImg(memberVo.getHeadImg());
|
||||
tbShopUser.setTelephone(memberVo.getTelephone());
|
||||
tbShopUser.setBirthDay(memberVo.getBirthDay());
|
||||
tbShopUser.setIsVip(Byte.parseByte("1"));
|
||||
shopUserMapper.updateByPrimaryKey(tbShopUser);
|
||||
if(tbShopUser!=null){
|
||||
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
|
||||
tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg())?memberVo.getHeadImg():null);
|
||||
tbShopUser.setTelephone(memberVo.getTelephone());
|
||||
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
|
||||
tbShopUser.setIsVip(Byte.parseByte("1"));
|
||||
shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
|
||||
}else {
|
||||
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
|
||||
tbShopUser = new TbShopUser();
|
||||
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
|
||||
tbShopUser.setSex(Byte.parseByte("1"));
|
||||
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
|
||||
tbShopUser.setLevel(Byte.parseByte("1"));
|
||||
String dynamicCode = RandomUtil.randomNumbers(8);
|
||||
tbShopUser.setCode(dynamicCode);
|
||||
tbShopUser.setTelephone(memberVo.getTelephone());
|
||||
tbShopUser.setAmount(BigDecimal.ZERO);
|
||||
tbShopUser.setIsVip(Byte.parseByte("0"));
|
||||
tbShopUser.setCreditAmount(BigDecimal.ZERO);
|
||||
tbShopUser.setConsumeAmount(BigDecimal.ZERO);
|
||||
tbShopUser.setConsumeNumber(0);
|
||||
tbShopUser.setLevelConsume(BigDecimal.ZERO);
|
||||
tbShopUser.setStatus(Byte.parseByte("1"));
|
||||
tbShopUser.setShopId(memberVo.getShopId().toString());
|
||||
tbShopUser.setUserId(tbUserInfo.getId().toString());
|
||||
tbShopUser.setMiniOpenId(tbUserInfo.getMiniAppOpenId());
|
||||
tbShopUser.setCreatedAt(System.currentTimeMillis());
|
||||
tbShopUser.setUpdatedAt(System.currentTimeMillis());
|
||||
shopUserMapper.insertSelective(tbShopUser);
|
||||
}
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
}
|
||||
|
||||
public Result upVipPhont(OpenMemberVo memberVo) {
|
||||
TbShopUser shopUser = new TbShopUser();
|
||||
shopUser.setId(memberVo.getId().toString());
|
||||
shopUser.setTelephone(memberVo.getTelephone());
|
||||
shopUserMapper.updateByPrimaryKeySelective(shopUser);
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user