Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamCollectParam.java

@@ -12,9 +12,9 @@ public class AdamCollectParam implements java.io.Serializable {
     private String contentId;
     @ApiModelProperty(position = 12, required = true, value = "内容类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG")
     private String type;
-    @ApiModelProperty(position = 13, required = true, value = "内容标题[255]", example = "13111111111")
+    @ApiModelProperty(position = 13, required = true, value = "内容标题[255]", example = "Swagger Collect")
     private String contentTitle;
-    @ApiModelProperty(position = 14, required = true, value = "内容快照[255]", example = "北京")
+    @ApiModelProperty(position = 14, required = true, value = "内容快照[255]", example = "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png")
     private String contentImg;
     @ApiModelProperty(position = 15, required = false, value = "持续时间,单位S,VIDEO类型时必传[30]", example = "100")
     private Long duration;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java

@@ -15,7 +15,7 @@ public class AdamRealInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 12, value = "证件号[50]")
     private String idCard;
     @ApiModelProperty(position = 13, value = "状态:1-正常")
-    private String state;
+    private Integer state;
 
     private static final AdamRealInfoVo obj = new AdamRealInfoVo();
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamThirdPartInfoVo.java

@@ -22,9 +22,9 @@ public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {
     private String platform;
     @ApiModelProperty(position = 16, value = "状态[1-绑定,2-解绑]")
     private Integer state;
-    @ApiModelProperty(position = 17, value = "状态[1-绑定,2-解绑]")
+    @ApiModelProperty(position = 17, value = "创建时间")
     private String createdAt;
-    @ApiModelProperty(position = 18, value = "状态[1-绑定,2-解绑]")
+    @ApiModelProperty(position = 18, value = "更新时间")
     private String updatedAt;
 
     private static final AdamThirdPartInfoVo obj = new AdamThirdPartInfoVo();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserInfoVo.java

@@ -40,8 +40,8 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     private String closedAt;
     @ApiModelProperty(position = 24, value = "是否完善信息[0-未完善,1-已完善]")
     private Integer isComplete;
-//    @ApiModelProperty(position = 25, value = "")
-//    private String rongCloudToken;
+    @ApiModelProperty(position = 25, value = "")
+    private String rongCloudToken;
 
     private static final AdamUserInfoVo obj = new AdamUserInfoVo();
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java

 package com.liquidnet.service.adam.service;
 
+import com.liquidnet.service.adam.dto.vo.AdamCollectionVo;
 import com.liquidnet.service.adam.entity.AdamCollection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAdamCollectionService extends IService<AdamCollection> {
 
+    void add(AdamCollectionVo collectionVo);
+
+    AdamCollectionVo query(String uid, String type, String contentId);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRealNameService.java

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.entity.AdamRealName;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IAdamRealNameService extends IService<AdamRealName> {
 
     AdamRealInfoVo queryByUid(String uid);
+
+    void add(AdamRealName realName);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

 package com.liquidnet.service.adam.service;
 
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
+import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUser;
@@ -68,4 +69,6 @@ public interface IAdamUserService extends IService<AdamUser> {
     List<AdamThirdPartInfoVo> unBindTpa(String uid, String platform);
 
     void close(String uid);
+
+    void identity(String uid, String name, String idCard);
 }

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

@@ -12,9 +12,9 @@ public class AdamRedisConst {
     public static final String INFO_USER = ADAM.concat(":list:users");
     public static final String INFO_REAL_NAME = ADAM.concat(":list:real_name");
     public static final String INFO_THIRD_PARTY = ADAM.concat(":list:third_party");
-
     public static final String INFO_ENTERS = ADAM.concat(":list:enters:");
     public static final String INFO_ADDRESSES = ADAM.concat(":list:addresses:");
+    public static final String INFO_COLLECT = ADAM.concat(":list:collect:");
 
     public static final String INFO_MEMBERS = ADAM.concat(":list:members");
 

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

@@ -56,7 +56,7 @@ public class AdamAddressesController {
 
         adamAddressesService.add(adamAddresses);
 
-        return ResponseDto.success();
+        return ResponseDto.success(adamAddresses.getAddressesId());
     }
 
     @ApiOperationSupport(order = 2)
@@ -118,4 +118,15 @@ public class AdamAddressesController {
         adamAddressesService.remove(currentUid, addrId);
         return ResponseDto.success();
     }
+
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "收货地址详情")
+    @PostMapping("query/{id}")
+    public ResponseDto<AdamAddressesVo> query(@PathVariable(name = "id") String addrId) {
+        // TODO: 2021/4/28 校验
+
+        AdamAddresses addresses = adamAddressesService.query(CurrentUtil.getCurrentUid(), addrId);
+
+        return null == addresses ? ResponseDto.failure(ErrorMapping.get(10105)) : ResponseDto.success(AdamAddressesVo.getNew().copy(addresses));
+    }
 }

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

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.adam.dto.vo.AdamCollectionVo;
+import com.liquidnet.service.adam.service.IAdamCollectionService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.adam.dto.AdamCollectParam;
 import io.swagger.annotations.Api;
@@ -11,6 +13,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -27,6 +31,8 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("collect")
 public class AdamCollectionController {
+    @Autowired
+    IAdamCollectionService adamCollectionService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加收藏")
@@ -35,7 +41,13 @@ public class AdamCollectionController {
         // TODO: 2021/4/28 数据校验
         String currentUid = CurrentUtil.getCurrentUid();
 
+        AdamCollectionVo existVo = adamCollectionService.query(currentUid, parameter.getType(), parameter.getContentId());
+        if (null != existVo) return ResponseDto.success();
 
+        AdamCollectionVo collectionVo = AdamCollectionVo.getNew();
+        BeanUtils.copyProperties(parameter, collectionVo);
+        collectionVo.setUid(currentUid);
+        adamCollectionService.add(collectionVo);
 
         return ResponseDto.success();
     }

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

@@ -41,7 +41,7 @@ public class AdamEntersController  {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加入场人")
     @PostMapping("add")
-    public ResponseDto<Object> add(@RequestBody AdamEntersParam parameter) {
+    public ResponseDto<String> add(@RequestBody AdamEntersParam parameter) {
         // TODO: 2021/4/28 数据校验
         String currentUid = CurrentUtil.getCurrentUid();
 
@@ -55,7 +55,7 @@ public class AdamEntersController  {
 
         adamEntersService.add(addInfo);
 
-        return ResponseDto.success();
+        return ResponseDto.success(addInfo.getEntersId());
     }
 
     @ApiOperationSupport(order = 2)
@@ -114,21 +114,20 @@ public class AdamEntersController  {
         String currentUid = CurrentUtil.getCurrentUid();
 
         AdamEnters enters = adamEntersService.query(currentUid, entersId);
-        if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
+        if (null == enters) return ResponseDto.failure(ErrorMapping.get(10105));
 
         adamEntersService.remove(currentUid, entersId);
         return ResponseDto.success();
     }
 
-//    @ApiOperationSupport(order = 5)
-//    @ApiOperation(value = "入场人详情")
-//    @PostMapping("query/{id}")
-//    public ResponseDto<AdamEntersVo> query(@PathVariable(name = "id") String entersId) {
-//        // TODO: 2021/4/28 校验、获取登录UID
-//        String uid = "1";
-//
-//        AdamEnters info = adamEntersService.query(uid, entersId);
-//
-//        return null == info ? ResponseDto.success() : ResponseDto.success(AdamEntersVo.getNew().copy(info));
-//    }
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "入场人详情")
+    @PostMapping("query/{id}")
+    public ResponseDto<AdamEntersVo> query(@PathVariable(name = "id") String entersId) {
+        // TODO: 2021/4/28 校验
+
+        AdamEnters info = adamEntersService.query(CurrentUtil.getCurrentUid(), entersId);
+
+        return null == info ? ResponseDto.failure(ErrorMapping.get(10105)) : ResponseDto.success(AdamEntersVo.getNew().copy(info));
+    }
 }

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

@@ -104,8 +104,8 @@ public class AdamLoginController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "手机号验证码登录")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "验证码"),
+            @ApiImplicitParam(type = "body", required = true, dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(type = "body", required = true, dataType = "String", name = "code", value = "验证码"),
     })
     @PostMapping(value = {"login/sms"})
     public ResponseDto<AdamLoginInfoVo> loginBySms(@RequestParam String mobile, @RequestParam String code) {
@@ -196,6 +196,7 @@ public class AdamLoginController {
     @PostMapping(value = {"out"})
     public ResponseDto<Object> logout(HttpServletRequest request) {
         String uToken = request.getHeader(CurrentUtil.uToken);
+        log.info("###logout:uid:{}\ntoken:{}\nuToken:{}", CurrentUtil.getCurrentUid(), CurrentUtil.getToken(), uToken);
 
         String ssoKey = jwtValidator.getSsoRedisKey().concat(
                 DigestUtils.md5DigestAsHex(uToken.getBytes(StandardCharsets.UTF_8))
@@ -210,6 +211,7 @@ public class AdamLoginController {
     @ApiOperation(value = "注销")
     @PostMapping(value = {"close"})
     public ResponseDto<Object> close(HttpServletRequest request) {
+        log.info("###close:uid:{}", CurrentUtil.getCurrentUid());
         adamUserService.close(CurrentUtil.getCurrentUid());
         return this.logout(request);
     }

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

@@ -8,10 +8,8 @@ import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
-import com.liquidnet.service.adam.dto.vo.AdamTagParentVo;
-import com.liquidnet.service.adam.dto.vo.AdamTagVo;
-import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import com.liquidnet.service.adam.dto.vo.*;
+import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.service.IAdamThirdPartyService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.adam.service.IAdamUserService;
@@ -44,6 +42,8 @@ public class AdamUserController {
     IAdamUserInfoService adamUserInfoService;
     @Autowired
     IAdamThirdPartyService adamThirdPartyService;
+    @Autowired
+    IAdamRealNameService adamRealNameService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "个人资料编辑")
@@ -142,7 +142,27 @@ public class AdamUserController {
         return ResponseDto.success();
     }
 
-//    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "实名认证")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "姓名"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "idCard", value = "证件号"),
+    })
+    @PostMapping(value = {"identity"})
+    public ResponseDto<Object> identity(@RequestParam String name, @RequestParam String idCard) {
+        // TODO: 2021/5/10
+        log.info("name:{},idCard:{}", name, idCard);
+
+        AdamRealInfoVo realInfoVo = AdamRealInfoVo.getNew();
+        realInfoVo.setName(name);
+        realInfoVo.setIdCard(idCard);
+        realInfoVo.setState(1);
+        adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
+
+        return ResponseDto.success();
+    }
+
+//    @ApiOperationSupport(order = 6)
 //    @ApiOperation(value = "密码修改")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
@@ -159,7 +179,7 @@ public class AdamUserController {
 //        return ResponseDto.success();
 //    }
 
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "绑定第三方账号")
     @PostMapping(value = {"tpa/bind"})
     public ResponseDto<List<AdamThirdPartInfoVo>> bindTpa(@RequestBody AdamThirdPartParam parameter) {
@@ -182,7 +202,7 @@ public class AdamUserController {
         return ResponseDto.success(adamThirdPartyService.queryByUid(currentUid));
     }
 
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "解绑第三方账号")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),

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

 package com.liquidnet.service.adam.service.impl;
 
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
+import com.liquidnet.service.adam.dto.vo.AdamCollectionVo;
 import com.liquidnet.service.adam.entity.AdamCollection;
 import com.liquidnet.service.adam.mapper.AdamCollectionMapper;
 import com.liquidnet.service.adam.service.IAdamCollectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 收藏 服务实现类
@@ -16,5 +28,34 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper, AdamCollection> implements IAdamCollectionService {
+    @Autowired
+    MongoConverter mongoConverter;
+    @Autowired
+    MongoTemplate mongoTemplate;
+    @Autowired
+    RabbitTemplate rabbitTemplate;
+    @Autowired
+    RedisUtil redisUtil;
+
+    @Override
+    public void add(AdamCollectionVo collectionVo) {
+        LocalDateTime now = LocalDateTime.now();
+        String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
+
+
+    }
+
+    @Override
+    public AdamCollectionVo query(String uid, String type, String contentId) {
+        AdamCollectionVo vo = (AdamCollectionVo) redisUtil.hget(AdamRedisConst.INFO_COLLECT.concat(uid), type + contentId);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").is(contentId)),
+                    AdamCollectionVo.class, AdamCollectionVo.class.getSimpleName());
 
+            if (null != vo) {
+                redisUtil.hset(AdamRedisConst.INFO_COLLECT.concat(uid), type + contentId, vo);
+            }
+        }
+        return vo;
+    }
 }

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

@@ -103,8 +103,8 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
             info = mongoTemplate.findOne(
                     Query.query(Criteria.where("entersId").is(entersId).and("state").is(1)),
                     AdamEnters.class, AdamEnters.class.getSimpleName());
+            if (null == info) redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(uid), entersId, info);
         }
-
         return info;
     }
 

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

@@ -13,6 +13,9 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * <p>
  * 实名信息 服务实现类
@@ -35,8 +38,18 @@ public class AdamRealNameServiceImpl extends ServiceImpl<AdamRealNameMapper, Ada
             realInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
                     AdamRealInfoVo.class, AdamRealInfoVo.class.getSimpleName());
 
-            redisUtil.hset(AdamRedisConst.INFO_REAL_NAME, uid, realInfoVo);
+            if (null != realInfoVo) {
+                redisUtil.hset(AdamRedisConst.INFO_REAL_NAME, uid, realInfoVo);
+            }
         }
         return realInfoVo;
     }
+
+    @Override
+    public void add(AdamRealName realName) {
+        mongoTemplate.insert(Collections.singletonList(realName), AdamRealInfoVo.class.getSimpleName());
+
+        // TODO: 2021/5/18 sql to mq
+
+    }
 }

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

@@ -8,12 +8,15 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
+import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
+import com.liquidnet.service.adam.entity.AdamRealName;
 import com.liquidnet.service.adam.entity.AdamUser;
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import com.liquidnet.service.adam.service.IAdamEntersService;
+import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.service.IAdamThirdPartyService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.SqlMapping;
@@ -31,6 +34,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -60,6 +65,8 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     IAdamEntersService adamEntersService;
     @Autowired
     IAdamThirdPartyService adamThirdPartyService;
+    @Autowired
+    IAdamRealNameService adamRealNameService;
 
     @Override
     public AdamUserInfoVo queryByUid(String uid) {
@@ -68,7 +75,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
             userInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
                     AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
 
-            redisUtil.hset(AdamRedisConst.INFO_USER, uid, userInfoVo);
+            if (null != userInfoVo) redisUtil.hset(AdamRedisConst.INFO_USER, uid, userInfoVo);
         }
         return userInfoVo;
     }
@@ -110,6 +117,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public AdamUserInfoVo register(AdamThirdPartParam param) {
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
@@ -149,6 +157,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void bindTpa(String uid, AdamThirdPartParam param) {
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
@@ -168,6 +177,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public List<AdamThirdPartInfoVo> bindTpaForce(String bindUid, String unBindUid, AdamThirdPartParam param) {
         this.unBindTpaProcess(unBindUid, param.getPlatform());
 
@@ -208,6 +218,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public List<AdamThirdPartInfoVo> unBindTpa(String uid, String platform) {
         this.unBindTpaProcess(uid, platform);
 
@@ -220,6 +231,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void close(String uid) {
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
@@ -269,4 +281,25 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
                 .updateOne(Query.query(Criteria.where("uid").is(uid)).getQueryObject(), object);
         // TODO: 2021/5/14 Execute sql to mq
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public void identity(String uid, String name, String idCard) {
+        // TODO: 2021/5/18 调用第三方认证服务
+
+        AdamRealName realName = new AdamRealName();
+        realName.setRealNameId(IDGenerator.nextSnowId() + "");
+        realName.setUid(uid);
+        realName.setType("1");
+        realName.setName(name);
+        realName.setIdCard(idCard);
+        realName.setState(1);
+        realName.setCreatedAt(LocalDateTime.now());
+//        adamRealNameService.add(realName);
+
+        AdamRealInfoVo aNew = AdamRealInfoVo.getNew();
+
+        // TODO: 2021/5/18 修改UserInfoVo，同步redis
+
+    }
 }