会员如果手机号在PC存在 则绑定
This commit is contained in:
@@ -66,11 +66,6 @@ public class NotifyController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("test")
|
|
||||||
public void test(@RequestParam String payOrderNO){
|
|
||||||
payService.test(payOrderNO);
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequestMapping("notifyCallBack")
|
@RequestMapping("notifyCallBack")
|
||||||
public String notifyCallBack(HttpServletRequest request){
|
public String notifyCallBack(HttpServletRequest request){
|
||||||
|
|
||||||
|
|||||||
@@ -274,19 +274,30 @@ public class UserService {
|
|||||||
|
|
||||||
public Result openMember(OpenMemberVo memberVo) {
|
public Result openMember(OpenMemberVo memberVo) {
|
||||||
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
|
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
|
||||||
if(tbShopUser!=null){
|
if (tbShopUser != null) {
|
||||||
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
|
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
|
||||||
tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg())?memberVo.getHeadImg():null);
|
tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
|
||||||
tbShopUser.setTelephone(memberVo.getTelephone());
|
tbShopUser.setTelephone(memberVo.getTelephone());
|
||||||
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
|
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
|
||||||
tbShopUser.setIsVip(Byte.parseByte("1"));
|
tbShopUser.setIsVip(Byte.parseByte("1"));
|
||||||
shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
|
shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
|
||||||
}else {
|
} else {
|
||||||
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
|
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
|
||||||
|
tbShopUser = shopUserMapper.selectPCByPhoneAndShopId(memberVo.getTelephone(), memberVo.getShopId().toString());
|
||||||
|
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.setUserId(tbUserInfo.getId().toString());
|
||||||
|
tbShopUser.setMiniOpenId(tbUserInfo.getMiniAppOpenId());
|
||||||
|
shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
|
||||||
|
return Result.success(CodeEnum.SUCCESS);
|
||||||
|
}
|
||||||
tbShopUser = new TbShopUser();
|
tbShopUser = new TbShopUser();
|
||||||
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
|
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
|
||||||
tbShopUser.setSex(Byte.parseByte("1"));
|
tbShopUser.setSex(Byte.parseByte("1"));
|
||||||
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
|
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
|
||||||
tbShopUser.setLevel(Byte.parseByte("1"));
|
tbShopUser.setLevel(Byte.parseByte("1"));
|
||||||
String dynamicCode = RandomUtil.randomNumbers(8);
|
String dynamicCode = RandomUtil.randomNumbers(8);
|
||||||
tbShopUser.setCode(dynamicCode);
|
tbShopUser.setCode(dynamicCode);
|
||||||
|
|||||||
Reference in New Issue
Block a user