Commit efda227c authored by Java—KA—李 青's avatar Java—KA—李 青

增加注释及代码优化

parent c51585b8
......@@ -207,6 +207,25 @@ public class UserController implements IBaseController {
// return createSession(channelId, createdFrom, appChannel, user);
}
private User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel, Long btRegisterChannelId,String dimension) {
String password = PasswordUtil.generateRandomPwd(15);
LOGGER.info("用户快速注册:login/fast -> phoneNo:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId:{}", phoneNo, channelId, registerFrom, appChannel,btRegisterChannelId);
if (!ValidationUtil.validatePhoneNo(phoneNo)) {
LOGGER.info("用户快速注册失败,手机号错误:login/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
throw new UserNotExistException("手机号错误");
}
if (null == registerFrom) {
registerFrom = 1L;
}
if (channelId == 222L) {
registerFrom=222L;
}
User user=userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);
LOGGER.info("用户快速注册成功:login/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
MqUtils.sendRegisterMessage(channelId,dimension, user);
return user;
}
/**
* 快速登录验证
*
......
......@@ -17,17 +17,17 @@ import lombok.NoArgsConstructor;
public class UserRegisterParam {
/** ======数据部分开始====== */
private Long registerFrom;
private String phoneNo;
private String password;
private String idNo;
private String name;
private Long channelId;
private Long btRegisterChannelId;
private Long registerFrom; // 注册渠道
private String phoneNo; // 手机号
private String password; // 密码
private String idNo; // 身份证号
private String name; // 姓名
private Long channelId; // 业务渠道
private Long btRegisterChannelId; // 白条渠道
private String dimension;
private Address address;
private String contacts;
private User user;
private Address address; // 地址
private String contacts; // 联系人
private User user; // 注册生成的用户,也是返回结果
/** ======数据部分结束====== */
/** ======流程控制部分开始====== */
......
......@@ -40,8 +40,7 @@ public class ContactUserRegisterHandler extends AbstractUserRegisterHandler {
List<Contact> contactList = JSONObject.parseObject(contact_str, new TypeReference<List<Contact>>() {});
if (CollectionUtils.isNotEmpty(contactList)) {
Timestamp now = new Timestamp(System.currentTimeMillis());
convertContactList(user.getId(), contactList, 2, now);
convertContactList(user.getId(), contactList, 2);
contactRepository.save(contactList);
}
}
......@@ -53,12 +52,12 @@ public class ContactUserRegisterHandler extends AbstractUserRegisterHandler {
/**
* 转换联系人信息
* @param userId
* @param contacts
* @param number
* @param now
* @param userId 用户id
* @param contacts 联系人列表
* @param number 允许的联系人数量
*/
private void convertContactList(Long userId, List<Contact> contacts,int number, Timestamp now) {
private void convertContactList(Long userId, List<Contact> contacts,int number) {
Timestamp now = new Timestamp(System.currentTimeMillis());
int count = 1;
for (Contact c : contacts) {
if (count > number) {
......
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