用户认证。

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileUserVO.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,7 +43,8 @@ public class SmileUserVO implements Serializable {
     /**
      * 生日YYYY-MM-DD
      */
-    @ApiModelProperty(value = "生日")
+    @ApiModelProperty(value = "生日(yyyy-MM-dd HH:mm:ss)")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDate birthday;
 
     /**
@@ -60,7 +63,7 @@ public class SmileUserVO implements Serializable {
      * 省key
      */
     @ApiModelProperty(value = "省key")
-    private Integer provinceKey;
+    private String provinceKey;
 
     /**
      * 省
@@ -72,7 +75,7 @@ public class SmileUserVO implements Serializable {
      * 市key
      */
     @ApiModelProperty(value = "市key")
-    private Integer cityKey;
+    private String cityKey;
 
     /**
      * 市
@@ -84,7 +87,7 @@ public class SmileUserVO implements Serializable {
      * 区key
      */
     @ApiModelProperty(value = "区key")
-    private Integer areaKey;
+    private String areaKey;
 
     /**
      * 区
@@ -120,7 +123,7 @@ public class SmileUserVO implements Serializable {
      * 身份证号
      */
     @ApiModelProperty(value = "身份证号")
-    private Long idCard;
+    private String idCard;
 
     /**
      * 学校名称

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java

@@ -4,5 +4,5 @@ import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 
 public interface SmileFrontService {
 
-    public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo);
+    public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type);
 }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

@@ -42,12 +42,13 @@ public class SmileUserController {
     public ResponseDto saveOrUpdateUserOneStep(SmileUserVO smileUserVO) {
         String userId = CurrentUtil.getCurrentUid();
         SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+        smileUserVO.setUid(userId);
         if(null==smileUserVORedis){
             smileUserVO.setTag("1");
         }else{
             smileUserVO.setTag(smileUserVORedis.getTag().concat(",1"));
         }
-        smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis);
+        smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"1");
         return  ResponseDto.success();
     }
 
@@ -55,6 +56,7 @@ public class SmileUserController {
     @ApiOperation("增加或者删除第二步")
     public ResponseDto saveOrUpdateUserTwoStep(SmileUserVO smileUserVO) {
         String userId = CurrentUtil.getCurrentUid();
+        smileUserVO.setUid(userId);
         SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
         if(null==smileUserVORedis){
             smileUserVORedis.setTag("2");
@@ -65,13 +67,14 @@ public class SmileUserController {
                 smileUserVO.setTag(smileUserVORedis.getTag().concat(",2"));
             }
         }
-        smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis);
+        smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
         return  ResponseDto.success();
     }
     @PostMapping("saveOrUpdateUserThreeStep")
     @ApiOperation("增加或者删除第三步")
     public ResponseDto saveOrUpdateUserThreeStep(SmileUserVO smileUserVO) {
         String userId = CurrentUtil.getCurrentUid();
+        smileUserVO.setUid(userId);
         SmileUserVO smileUserVORedis= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
         if(null==smileUserVORedis){
             smileUserVORedis.setTag("3");
@@ -81,7 +84,7 @@ public class SmileUserController {
                 smileUserVO.setTag(smileUserVORedis.getTag().concat(",3"));
             }
         }
-        smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis);
+        smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"3");
         return  ResponseDto.success();
     }
 

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java

 package com.liquidnet.service.service.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 @Service
 @Slf4j
 public class SmileFrontServiceImpl implements SmileFrontService {
     @Autowired
     private RedisUtil redisUtil;
 
-    public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo){
+    public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
         //redis里面更新
-
+        if(null==redisVo){
+            smileUserVO.setCreatedDate(LocalDateTime.now());
+            redisUtil.set(SmileRedisConst.SMILE_USER.concat(smileUserVO.getUid()),smileUserVO);
+            //插入
+        }else{
+            //update
+            setUser(smileUserVO,redisVo,type);
+            redisUtil.set(SmileRedisConst.SMILE_USER.concat(redisVo.getUid()),redisVo);
+        }
         return true;
     }
+    public void setUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
+        if(type.equals("1")){
+            redisVo.setImg(smileUserVO.getImg());
+            redisVo.setSex(smileUserVO.getSex());
+            redisVo.setProvinceKey(smileUserVO.getProvinceKey());
+            redisVo.setProvince(smileUserVO.getProvince());
+            redisVo.setCity(smileUserVO.getCity());
+            redisVo.setCityKey(smileUserVO.getCityKey());
+            redisVo.setArea(smileUserVO.getArea());
+            redisVo.setAreaKey(smileUserVO.getAreaKey());
+            redisVo.setAddress(smileUserVO.getAddress());
+            redisVo.setWechat(smileUserVO.getWechat());
+            redisVo.setSchoolName(smileUserVO.getSchoolName());
+            redisVo.setSchoolMajor(smileUserVO.getSchoolMajor());
+            redisVo.setIdentity(smileUserVO.getIdentity());
+            redisVo.setTag(smileUserVO.getTag());
+            redisVo.setUpdatedDate(LocalDateTime.now());
+            redisVo.setUid(smileUserVO.getUid());
+
+        }else if (type.equals("2")){
+            redisVo.setName(smileUserVO.getName());
+            redisVo.setIdCard(smileUserVO.getIdCard());
+            redisVo.setUpdatedDate(LocalDateTime.now());
+            redisVo.setUid(smileUserVO.getUid());
+        }else if(type.equals("3")){
+            redisVo.setIntroduce(smileUserVO.getIntroduce());
+            redisVo.setSpecialty1(smileUserVO.getSpecialty1());
+            redisVo.setSpecialty2(smileUserVO.getSpecialty2());
+            redisVo.setSpecialty3(smileUserVO.getSpecialty2());
+            redisVo.setUpdatedDate(LocalDateTime.now());
+            redisVo.setUid(smileUserVO.getUid());
+        }
+    }
 
 
 }