针对草莓音乐节小程序登录跳过完善资料处理;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamConst.java

+package com.liquidnet.service.adam.constant;
+
+public class AdamConst {
+    public static final String DEF_URL_AVATAR = "https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png";
+    public static final String DEF_URL_BACKGROUND = "https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png";
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamUserConst.java

-package com.liquidnet.service.adam.constant;
-
-public class AdamUserConst {
-
-    public enum UserAuthTypeEnum {
-        EMAIL,
-        SMS_CODE
-    }
-
-    public enum UserAuthResultEnum {
-        SUCCESS,
-        FAILURE,
-        PENDING
-    }
-
-    public enum UserRoleEnum {
-        Administrator, Executor, Viewer;
-    }
-
-    public enum Logical {
-        AND, OR;
-    }
-
-    public enum UserStatusEnum{
-            REMOVED("0","Removed"),
-            ACTIVE("1","Active"),
-            INVITED("2","Invited");
-        private String code;
-
-        private String desc;
-
-        UserStatusEnum(String code,String desc) {
-            this.code = code;
-            this.desc = desc;
-        }
-
-        public static UserStatusEnum byCode(String code) {
-            UserStatusEnum[] values = UserStatusEnum.values();
-            for (UserStatusEnum v : values) {
-                if (v.code.equals(code)) {
-                    return v;
-                }
-            }
-            return null;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-    }
-}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -183,14 +183,15 @@ public class AdamLoginController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "手机验证码登录")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "body", required = true, dataType = "String", name = "mobile", value = "手机号"),
-            @ApiImplicitParam(type = "body", required = true, dataType = "String", name = "code", value = "验证码"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "验证码"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "skip", value = "是否跳过完善资料[1-跳过]"),
     })
     @PostMapping(value = {"login/sms"})
     public ResponseDto<AdamLoginInfoVo> loginBySms(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
                                                    @RequestParam String mobile,
                                                    @Pattern(regexp = "\\d{6}", message = "验证码格式有误")
-                                                   @RequestParam String code) {
+                                                   @RequestParam String code, @RequestParam(required = false) Integer skip) {
         log.debug("mobile:{},code:{}", mobile, code);
         ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(mobile, code);
         if (!checkSmsCodeDto.isSuccess()) return checkSmsCodeDto;
@@ -208,6 +209,11 @@ public class AdamLoginController {
             userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
         }
 
+        if (0 == userInfoVo.getIsComplete() && null != skip && 1 == skip) {
+            // 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete）
+            userInfoVo.setIsComplete(1);
+        }
+
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (!toRegister) {
 //            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
+import com.liquidnet.service.adam.constant.AdamConst;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -53,9 +54,6 @@ public class AdamUserController {
     @Autowired
     IAdamUserInfoService adamUserInfoService;
 
-    private static final String avatarDefUrl = "https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png";
-    private static final String backgroundDefUrl = "https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png";
-
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "资料编辑")
     @PostMapping(value = {"edit"})
@@ -125,8 +123,8 @@ public class AdamUserController {
 //        editVo.setAvatar(parameter.getAvatar());
 //        editVo.setBackground(parameter.getBackground());
 //        editVo.setNickname(parameter.getNickname());
-        editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? avatarDefUrl : editVo.getAvatar());
-        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? backgroundDefUrl : editVo.getBackground());
+        editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? AdamConst.DEF_URL_AVATAR : editVo.getAvatar());
+        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? AdamConst.DEF_URL_BACKGROUND : editVo.getBackground());
         editVo.setNickname(editVo.getNickname());
         editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.impl;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.adam.constant.AdamConst;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
@@ -63,16 +64,17 @@ public class AdamUserServiceImpl implements IAdamUserService {
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public AdamUserInfoVo register(String mobile) {
         LocalDateTime now = LocalDateTime.now();
-        AdamUserInfoVo userInfoVo = null;
 
-        userInfoVo = AdamUserInfoVo.getNew();
-        userInfoVo.setUid(IDGenerator.nextSnowId() + "");
+        AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew();
+        userInfoVo.setUid(IDGenerator.nextSnowId());
         userInfoVo.setMobile(mobile);
         userInfoVo.setNickname(NknameUtil.randomNkname());
-        userInfoVo.setIsComplete(0);
         userInfoVo.setState(1);
-        userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
+        userInfoVo.setAvatar(AdamConst.DEF_URL_AVATAR);
+        userInfoVo.setBackground(AdamConst.DEF_URL_BACKGROUND);
         userInfoVo.setCreateAt(now);
+        userInfoVo.setIsComplete(0);
+        userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
 
 //                long s = System.currentTimeMillis();
 //                mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());