修复bug

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -296,7 +296,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
 
     LoginInfo loginInfo = new LoginInfo();
-    loginInfo.setUser(UserRet.getUserRet(user));
+    loginInfo.setUser(new UserRet(user));
     loginInfo.setToken(sessionStruct.getSid());
     LoginInfo.LoginContext context = new LoginInfo.LoginContext();
     context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());

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

@@ -148,7 +148,7 @@ public class AppController implements IBaseController {
     SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
 
     LoginInfo loginInfo = new LoginInfo();
-    loginInfo.setUser(UserRet.getUserRet(user));
+    loginInfo.setUser(new UserRet(user));
     loginInfo.setToken(sessionStruct.getSid());
     LoginInfo.LoginContext context = new LoginInfo.LoginContext();
     context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());

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

@@ -124,17 +124,8 @@ public class InnerController implements IBaseController {
     if (user == null) {
       return JsonResult.buildErrorStateResult("", null);
     }
-    UserRet userRet = new UserRet();
-    Long createTimeStamp = user.getCreatedAt().getTime();
-    Long updateTimeStamp = user.getUpdatedAt().getTime();
-    userRet.setId(user.getId());
-    userRet.setPhoneNo(user.getPhoneNo());
-    userRet.setEnable(user.getEnable());
-    userRet.setPassword(org.apache.commons.lang.StringUtils.defaultIfEmpty(user.getPassword(), ""));
-    userRet.setRegisteredFrom(user.getRegisteredFrom());
-    userRet.setUuid(user.getUuid());
-    userRet.setCreatedAt(createTimeStamp);
-    userRet.setUpdatedAt(updateTimeStamp);
+    UserRet userRet = new UserRet(user);
+
 
     return JsonResult.buildSuccessResult("", userRet);
   }
@@ -146,7 +137,7 @@ public class InnerController implements IBaseController {
     if (user == null) {
       return JsonResult.buildErrorStateResult("", null);
     }
-    UserRet userRet = UserRet.getUserRet(user);
+    UserRet userRet  = new UserRet(user);
     return JsonResult.buildSuccessResult("", userRet);
   }
 
@@ -207,7 +198,7 @@ public class InnerController implements IBaseController {
     user = userService.saveUser(user);
     UserRet userRet = null;
     if (user != null) {
-      userRet = UserRet.getUserRet(user);
+      userRet = new UserRet(user);
     }
     return JsonResult.buildSuccessResult(null, userRet);
   }
@@ -275,7 +266,7 @@ public class InnerController implements IBaseController {
   public JsonResult findUserByUserId(Long userId) {
     User user = userService.findById(userId);
     if (user != null) {
-      return JsonResult.buildSuccessResult(null, UserRet.getUserRet(user));
+      return JsonResult.buildSuccessResult(null,  new UserRet(user));
     }
     return JsonResult.buildErrorStateResult("", null);
   }
@@ -664,7 +655,7 @@ public class InnerController implements IBaseController {
 
     user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
 
-    UserRet userRet = UserRet.getUserRet(user);
+    UserRet userRet = new UserRet(user);
     return JsonResult.buildSuccessResult(null, userRet);
   }
 
@@ -680,6 +671,6 @@ public class InnerController implements IBaseController {
     if (user == null) {
       return JsonResult.buildErrorStateResult("注册失败", null);
     }
-    return JsonResult.buildSuccessResult(null, UserRet.getUserRet(user));
+    return JsonResult.buildSuccessResult(null, new UserRet(user));
   }
 }
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

@@ -54,7 +54,7 @@ public class AuthInfoController implements IBaseController {
     if(null != sessionStruct) {
       log.info("从用户中心获取到了用户登录信息:phone:[{}]", sessionStruct.getValues().getUser().getPhoneNo());
       LoginInfo loginInfo = new LoginInfo();
-      loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser()));
+      loginInfo.setUser(new UserRet(sessionStruct.getValues().getUser()));
       loginInfo.setToken(sessionStruct.getSid());
       LoginInfo.LoginContext context = new LoginInfo.LoginContext();
       context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
@@ -82,7 +82,7 @@ public class AuthInfoController implements IBaseController {
       String phoneNo = ((Map<String, String>) result.getData()).get("phoneNo");
       User user = userService.findByPhoneWithCache(phoneNo);
       LoginInfo loginInfo = new LoginInfo();
-      loginInfo.setUser(UserRet.getUserRet(user));
+      loginInfo.setUser(new UserRet(user));
       loginInfo.setToken(token);
       LoginInfo.LoginContext context = new LoginInfo.LoginContext();
       context.setChannelId(null);

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

@@ -95,7 +95,7 @@ public class UserController implements IBaseController {
   public JsonResult loginFast(
       @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
       @RequestParam(required = false, defaultValue = "1") Long createdFrom, String key,@RequestParam(required = false)Long btRegisterChannelId ,HttpServletRequest request) {
-    Map<String, JsonResult> validMap = getHeaderParam(request);
+        Map<String, JsonResult> validMap = getHeaderParam(request);
     if (null != validMap.get("fail")) {
       return validMap.get("fail");
     }
@@ -129,6 +129,9 @@ public class UserController implements IBaseController {
     if (null == registerFrom) {
       registerFrom = 1L;
     }
+    if (channelId == 222L) {
+      registerFrom=222L;
+    } 
     LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
 
     return userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);

src/main/java/cn/quantgroup/xyqb/model/UserRet.java

@@ -35,18 +35,17 @@ public class UserRet implements Serializable {
   //上一次修改时间
   private Long updatedAt;
 
-  public static UserRet getUserRet(User user) {
+  public  UserRet(User user) {
     Long createTimeStamp = user.getCreatedAt().getTime();
     Long updateTimeStamp = user.getUpdatedAt().getTime();
-    UserRet userRet = new UserRet();
-    userRet.setId(user.getId());
-    userRet.setPhoneNo(user.getPhoneNo());
-    userRet.setEnable(user.getEnable());
-    userRet.setPassword(StringUtils.defaultIfEmpty(user.getPassword(), ""));
-    userRet.setRegisteredFrom(user.getRegisteredFrom());
-    userRet.setUuid(user.getUuid());
-    userRet.setCreatedAt(createTimeStamp);
-    userRet.setUpdatedAt(updateTimeStamp);
-    return userRet;
+    this.setId(user.getId());
+    this.setPhoneNo(user.getPhoneNo());
+    this.setEnable(user.getEnable());
+    this.setPassword(StringUtils.defaultIfEmpty(user.getPassword(), ""));
+    this.setRegisteredFrom(user.getRegisteredFrom());
+    this.setUuid(user.getUuid());
+    this.setCreatedAt(createTimeStamp);
+    this.setUpdatedAt(updateTimeStamp);
+
   }
 }