提交 6ec4a7cd authored 作者: 000516's avatar 000516 提交者: Coding

根据Phone登录(促销员查询是否存在)

Merge Request: 根据Phone登录(促销员查询是否存在) Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/190?initial=true
...@@ -36,7 +36,7 @@ public class temporaryInfoQueryController { ...@@ -36,7 +36,7 @@ public class temporaryInfoQueryController {
* *
* @return 非null则登录成功 * @return 非null则登录成功
*/ */
@PostMapping("/temporary/login/phone_openid") // @PostMapping("/temporary/login/phone_openid")
public R temporaryLoginByPhoneAndOpenId(@RequestBody WxTemporaryLoginVo wxTemporaryLoginVo) { public R temporaryLoginByPhoneAndOpenId(@RequestBody WxTemporaryLoginVo wxTemporaryLoginVo) {
phontAndOpenIdVerify(wxTemporaryLoginVo); phontAndOpenIdVerify(wxTemporaryLoginVo);
if (!DataUtils.phonePattern(wxTemporaryLoginVo.getPhone())) { if (!DataUtils.phonePattern(wxTemporaryLoginVo.getPhone())) {
...@@ -46,6 +46,16 @@ public class temporaryInfoQueryController { ...@@ -46,6 +46,16 @@ public class temporaryInfoQueryController {
return R.success(loginVo); return R.success(loginVo);
} }
@PostMapping("/temporary/login/phone_openid")
public R temporaryLogin(@RequestBody WxTemporaryLoginVo wxTemporaryLoginVo) {
phontAndOpenIdVerify(wxTemporaryLoginVo);
if (!DataUtils.phonePattern(wxTemporaryLoginVo.getPhone())) {
throw new ParamException(RCode.PHONE_PARAM_ERROR, null);
}
LoginVo loginVo = weChatUserQueryService.temporaryLoginByPhone(wxTemporaryLoginVo.getPhone());
return R.success(loginVo);
}
/** /**
* 促销员信息查询 * 促销员信息查询
......
...@@ -172,8 +172,6 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao ...@@ -172,8 +172,6 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
if (!Objects.isNull(pw.getReportedId())) { if (!Objects.isNull(pw.getReportedId())) {
wq.eq(TemporaryActivityPhotoDO::getReportedId,pw.getReportedId()); wq.eq(TemporaryActivityPhotoDO::getReportedId,pw.getReportedId());
} }
return wq; return wq;
} }
......
...@@ -26,4 +26,6 @@ public interface TemporaryInfoDao { ...@@ -26,4 +26,6 @@ public interface TemporaryInfoDao {
void findPage(TemporaryWrapper tw, PageInfo pageInfo); void findPage(TemporaryWrapper tw, PageInfo pageInfo);
void updateById(WxTemporaryInfoDto temporaryDto); void updateById(WxTemporaryInfoDto temporaryDto);
WxTemporaryInfoDto selectByPhone(String phone);
} }
...@@ -86,6 +86,14 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao { ...@@ -86,6 +86,14 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao {
temporaryInfoMapper.updateById(entity); temporaryInfoMapper.updateById(entity);
} }
@Override
public WxTemporaryInfoDto selectByPhone(String phone) {
TemporaryWrapper tw = new TemporaryWrapper().setPhone(phone);
LambdaQueryWrapper<TemporaryInfoDO> doqwer = buildQueryList(tw);
TemporaryInfoDO temDo = temporaryInfoMapper.selectOne(doqwer);
return transitionDto(temDo);
}
private LambdaQueryWrapper<TemporaryInfoDO> buildQueryList(TemporaryWrapper tw) { private LambdaQueryWrapper<TemporaryInfoDO> buildQueryList(TemporaryWrapper tw) {
LambdaQueryWrapper<TemporaryInfoDO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TemporaryInfoDO> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(tw.getOpenId())) { if (StringUtils.isNotBlank(tw.getOpenId())) {
......
...@@ -10,4 +10,6 @@ import com.wangxiaolu.promotion.pojo.user.vo.LoginVo; ...@@ -10,4 +10,6 @@ import com.wangxiaolu.promotion.pojo.user.vo.LoginVo;
public interface WeChatUserQueryService { public interface WeChatUserQueryService {
LoginVo loginTemporaryByOpenIdAndPhone(String openId, String phone); LoginVo loginTemporaryByOpenIdAndPhone(String openId, String phone);
LoginVo temporaryLoginByPhone(String phone);
} }
...@@ -61,6 +61,27 @@ public class WeChatUserQueryServiceImpl implements WeChatUserQueryService { ...@@ -61,6 +61,27 @@ public class WeChatUserQueryServiceImpl implements WeChatUserQueryService {
String temporaryToken = JwtTokenUtils.createToken(claimsMap); String temporaryToken = JwtTokenUtils.createToken(claimsMap);
// String temporaryToken = jwtUtils.getTemporaryToken(openId, phone);
redisCache.addToJsonToMinute(RedisKeys.UserKeys.TEMPORARY_TOKEN.getKey() + token, temDto, 1080);
LoginVo loginVo = new LoginVo(temDto, temporaryToken);
return loginVo;
}
@Override
public LoginVo temporaryLoginByPhone(String phone) {
WxTemporaryInfoDto temDto = temporaryInfoDao.selectByPhone(phone);
if (Objects.isNull(temDto)) {
throw new DataException(RCode.LOGIN_USER_IS_NULL_ERROR);
}
String token = UUID.fastUUID().toString();
// Jwt存储信息
Map<String, Object> claimsMap = new HashMap<String, Object>();
claimsMap.put(TokenConstants.USER_KEY, token);
claimsMap.put(TokenConstants.DETAILS_USER_ID, temDto.getId());
claimsMap.put(TokenConstants.DETAILS_USERNAME, temDto.getName());
String temporaryToken = JwtTokenUtils.createToken(claimsMap);
// String temporaryToken = jwtUtils.getTemporaryToken(openId, phone); // String temporaryToken = jwtUtils.getTemporaryToken(openId, phone);
redisCache.addToJsonToMinute(RedisKeys.UserKeys.TEMPORARY_TOKEN.getKey() + token, temDto, 1080); redisCache.addToJsonToMinute(RedisKeys.UserKeys.TEMPORARY_TOKEN.getKey() + token, temDto, 1080);
LoginVo loginVo = new LoginVo(temDto, temporaryToken); LoginVo loginVo = new LoginVo(temDto, temporaryToken);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论