去掉 /user/save 没用的参数

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

@@ -101,6 +101,7 @@ public class InnerController implements IBaseController {
             'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
     };
 
+
     /**
      * 根据手机号或身份证号查询用户UUID
      *
@@ -224,10 +225,8 @@ public class InnerController implements IBaseController {
 
     @RequestMapping("/user/save")
     @ApiOperation(httpMethod = "POST", value = "注册用户")
-    public JsonResult saveUser(
-            String phoneNo, Long registeredFrom, Long createdAt, Long updatedAt,
-            String password, String uuid) {
-        log.info("保存用户，phoneNo：{},registeredFrom;{},uuid:{},createdAt:{},updatedAt:{}", phoneNo, registeredFrom, uuid, createdAt, updatedAt);
+    public JsonResult saveUser(String phoneNo, Long registeredFrom) {
+        log.info("保存用户,phoneNo:{},registeredFrom:{}", phoneNo, registeredFrom);
         //参数验证
         if (StringUtils.isBlank(phoneNo)) {
             return JsonResult.buildErrorStateResult("用户手机号不能为空.", null);
@@ -235,34 +234,19 @@ public class InnerController implements IBaseController {
         if (registeredFrom == null) {
             registeredFrom = 0L;
         }
-        if (StringUtils.isBlank(password)) {
-            password = genRandomPwd();
-        }
-        if (StringUtils.isBlank(uuid)) {
-            return JsonResult.buildErrorStateResult("用户uuid为空.", null);
-        }
-        if (createdAt == 0L || updatedAt == 0L) {
-            createdAt = System.currentTimeMillis();
-            updatedAt = System.currentTimeMillis();
-        }
         User user = userService.findByPhoneWithCache(phoneNo);
-        if (user == null) {
-            user = new User();
-            user.setCreatedAt(new Timestamp(createdAt));
-        } else if (!user.getEnable()) {
-            log.info("用户已经注销，phoneNo：{}", phoneNo);
-            return JsonResult.buildErrorStateResult("用户已经注销", null);
-        }
-        if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) {
-            user.setUuid(uuid);
-        }
-        user.setPhoneNo(phoneNo);
-        user.setUpdatedAt(new Timestamp(updatedAt));
-        user.setEnable(true);
-        user.setRegisteredFrom(registeredFrom);
-        user.setUuid(uuid);
-        user.setPassword(password);
-        user = userService.saveUser(user);
+
+        if (user != null) {
+            //存在已注销
+            if (!user.getEnable()) {
+                log.info("用户已经注销，phoneNo：{}", phoneNo);
+                return JsonResult.buildErrorStateResult("用户已经注销", null);
+            }
+            //已存在用户
+            return JsonResult.buildSuccessResult(null, new UserRet(user));
+        }
+        //注册新用户
+        user = userRegisterService.register(registeredFrom, phoneNo, null, null, 0L, 0L);
         return JsonResult.buildSuccessResult(null, new UserRet(user));
     }
 
@@ -623,7 +607,7 @@ public class InnerController implements IBaseController {
      * @param name    - 姓名
      * @param phoneNo - 手机号
      * @param idNo    - 身份证号
-     * @return JsonResult<List   <   UserDetail>>
+     * @return JsonResult<List                                                               <                                                               UserDetail>>
      */
     @RequestMapping("/user_detail/search_list")
     @ApiOperation(httpMethod = "POST", value = "按照姓名、份证号或手机号查询用户实名信息 - 精确查询，供客服用，不限制入参正确性")
@@ -642,7 +626,7 @@ public class InnerController implements IBaseController {
      *
      * @param phoneNo - 手机号
      * @param idNo    - 身份证号
-     * @return JsonResult<List   <   UserDetail>>
+     * @return JsonResult<List                                                               <                                                               UserDetail>>
      */
     @ApiOperation(httpMethod = "POST", value = "按照身份证号和手机号查询用户实名信息查询 - 模糊查询")
     @RequestMapping("/user_detail/fuzzyQuery")