修复白条渠道号为1的问题

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -80,7 +80,7 @@ public class AppController implements IBaseController {
         LOGGER.info("第三方用户登录, loginFrom:{}, requestIp:{}", registerFrom, requestIp);
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
-            user = register(registerFrom, phoneNo, idNo, name);
+            user = register(registerFrom, phoneNo, idNo, name, channelId);
         }
         if (user == null) {
             return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
@@ -121,7 +121,7 @@ public class AppController implements IBaseController {
         LOGGER.info("第三方用户登录, loginFrom:{}, requestIp:{}", registerFrom, requestIp);
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
-            user = register(registerFrom, phoneNo, idNo, name);
+            user = register(registerFrom, phoneNo, idNo, name, channelId);
         }
         if (user == null) {
             return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
@@ -156,7 +156,7 @@ public class AppController implements IBaseController {
      *
      * @return
      */
-    private User register(Long registerFrom, String phoneNo, String idNo, String name) {
+    private User register(Long registerFrom, String phoneNo, String idNo, String name, Long channelId) {
 
         String randomCode = String.valueOf(random.nextInt(899999) + 100000);
 
@@ -166,7 +166,12 @@ public class AppController implements IBaseController {
         LOGGER.info("第三方登录用户，保存 User");
 
         User user = new User();
-        user.setRegisteredFrom(registerFrom);
+        if(channelId == 222L) {
+            user.setRegisteredFrom(channelId);
+        } else {
+            user.setRegisteredFrom(registerFrom);
+        }
+        //user.setRegisteredFrom(registerFrom);
         user.setUuid(uuid);
         user.setEnable(true);
         user.setPhoneNo(phoneNo);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -194,7 +194,7 @@ public class UserController implements IBaseController {
             LOGGER.info("用户快速注册失败，短信验证码错误, registerFrom:{}, phoneNo:{}, verificationCode:{}", registerFrom, phoneNo, verificationCode);
             return JsonResult.buildErrorStateResult("短信验证码错误", null);
         }
-        if (!userService.register(phoneNo, password, registerFrom, getIp())) {
+        if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId)) {
             LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
         }
@@ -216,7 +216,7 @@ public class UserController implements IBaseController {
      */
     @RequestMapping("/register")
     public JsonResult register(@RequestParam String phoneNo, @RequestParam String password,
-                               @RequestParam String verificationCode, @RequestParam(required = false) Long channelId,
+                               @RequestParam(required = false) String verificationCode, @RequestParam(required = false) Long channelId,
                                @RequestParam(required = false) Long registerFrom) {
         LOGGER.info("用户注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{}", phoneNo, verificationCode, channelId, registerFrom);
         if (!ValidationUtil.validatePhoneNo(phoneNo)) {
@@ -238,12 +238,12 @@ public class UserController implements IBaseController {
             LOGGER.info("用户注册失败，该手机号已经被注册, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
         }
-        if (!smsService.validRegisterOrResetPasswdVerificationCode(phoneNo, verificationCode)) {
+        /*if (!smsService.validRegisterOrResetPasswdVerificationCode(phoneNo, verificationCode)) {
             LOGGER.info("用户注册失败，短信验证码错误, registerFrom:{}, phoneNo:{}, verificationCode:{}", registerFrom, phoneNo, verificationCode);
             return JsonResult.buildErrorStateResult("短信验证码错误", null);
-        }
-        if (!userService.register(phoneNo, password, registerFrom, getIp())) {
-            LOGGER.info("用户注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+        }*/
+        if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId)) {
+            LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
         }
 

src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java

@@ -34,12 +34,12 @@ public class SmsServiceImpl implements ISmsService {
     @Qualifier("stringRedisTemplate")
     private RedisTemplate<String, String> stringRedisTemplate;
 
-    private SmsSender smsSender = null;
+    private static final SmsSender smsSender = new SmsSender();
 
     @Override
     public SmsSender getSmsSender() {
         if (null == smsSender) {
-            smsSender = new SmsSender();
+            return smsSender;
         }
         return this.smsSender;
     }

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -12,7 +12,7 @@ public interface IUserService {
 
     User findByUuidWithCache(String uuid);
 
-    boolean register(String phoneNo, String password, Long registerFrom, String userIp);
+    boolean register(String phoneNo, String password, Long registerFrom, String userIp, Long channelId);
 
     User registerAndReturn(String phoneNo, String password, Long registerFrom);
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -89,8 +89,7 @@ public class UserServiceImpl implements IUserService {
 
     @Override
     @Transactional(value = Transactional.TxType.REQUIRED)
-    public boolean register(String phoneNo, String password, Long registerFrom, String userIp) {
-
+    public boolean register(String phoneNo, String password, Long registerFrom, String userIp, Long channelId) {
         String uuid = lkbUserService.registerApp(phoneNo, password);
         Timestamp currentTime = new Timestamp(System.currentTimeMillis());
 
@@ -101,7 +100,13 @@ public class UserServiceImpl implements IUserService {
         user.setCreatedAt(currentTime);
         user.setUuid(uuid);
         user.setPassword(PasswordUtil.MD5(password.toLowerCase() + Constants.PASSWORD_SALT));
-        user.setRegisteredFrom(registerFrom);
+        //解决线上白条registerFrom为1的问题
+        if(channelId == 222L) {
+            user.setRegisteredFrom(channelId);
+        } else {
+            user.setRegisteredFrom(registerFrom);
+        }
+        //user.setRegisteredFrom(registerFrom);
 
         user = userRepository.save(user);
         smsService.sendAfterRegister(phoneNo);