注册用户添加qrcode;

登录返回会员资料;

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

@@ -19,8 +19,8 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     private AdamRealInfoVo realNameInfo;
     @ApiModelProperty(position = 14, value = "用户第三方账号信息")
     private List<AdamThirdPartInfoVo> thirdPartInfo;
-    @ApiModelProperty(position = 15, value = "会员信息 -> 待定")
-    private Object memberInfo;
+    @ApiModelProperty(position = 15, value = "会员信息")
+    private AdamUserMemberVo memberInfo;
 
     private static final AdamLoginInfoVo obj = new AdamLoginInfoVo();
 

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

@@ -42,6 +42,8 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     private Integer isComplete;
     @ApiModelProperty(position = 25, value = "")
     private String rongCloudToken;
+    @ApiModelProperty(position = 26, value = "身份二维码")
+    private String qrCode;
 
     private static final AdamUserInfoVo obj = new AdamUserInfoVo();
 

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

@@ -14,7 +14,6 @@ public class AdamRedisConst {
     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/AdamLoginController.java

@@ -16,6 +16,7 @@ import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.service.IAdamThirdPartyService;
+import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -57,6 +58,8 @@ public class AdamLoginController {
     IAdamRealNameService adamRealNameService;
     @Autowired
     IAdamThirdPartyService adamThirdPartyService;
+    @Autowired
+    IAdamUserMemberService adamUserMemberService;
 
     /*@ApiOperationSupport(order = 1)
     @ApiOperation(value = "手机号密码登录")
@@ -121,8 +124,7 @@ public class AdamLoginController {
         if (userInfoVo.getIsComplete() == 1) {
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(userInfoVo.getUid()));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(userInfoVo.getUid()));
-            // TODO: 2021/5/12 会员信息
-            loginInfoVo.setMemberInfo(null);
+            loginInfoVo.setMemberInfo(adamUserMemberService.getUserMemberInfo(userInfoVo.getUid()));
         }
         loginInfoVo.setUserInfo(userInfoVo);
 
@@ -152,8 +154,7 @@ public class AdamLoginController {
         if (loginInfoVo.getUserInfo().getIsComplete() == 1) {
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(userInfoVo.getUid()));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(userInfoVo.getUid()));
-            // TODO: 2021/5/12 会员信息
-            loginInfoVo.setMemberInfo(null);
+            loginInfoVo.setMemberInfo(adamUserMemberService.getUserMemberInfo(userInfoVo.getUid()));
         }
         loginInfoVo.setUserInfo(userInfoVo);
 
@@ -178,6 +179,7 @@ public class AdamLoginController {
             loginInfoVo.setUserInfo(adamUserService.queryByUid(uid));
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(uid));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(uid));
+            loginInfoVo.setMemberInfo(adamUserMemberService.getUserMemberInfo(uid));
         } else {// 新账号注册
             if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) return ResponseDto.failure(ErrorMapping.get("10002"));
 

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

@@ -63,7 +63,7 @@ public class AdamUserController {
         editUserInfoVo.setSignature(parameter.getSignature());
         editUserInfoVo.setTagMe(parameter.getTagMe());
         editUserInfoVo.setIsComplete(1);
-        editUserInfoVo.setUpdatedAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
+        editUserInfoVo.setUpdatedAt(DateUtil.getNowTime());
 
         adamUserInfoService.edit(editUserInfoVo);
 

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

@@ -47,8 +47,8 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
     RedisUtil redisUtil;
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamUserInfoVo userInfoVo) {
-        boolean isNotComplete = userInfoVo.getIsComplete() == 0;
         BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(userInfoVo));
         Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
                 Query.query(Criteria.where("uid").is(userInfoVo.getUid())).getQueryObject(),
@@ -63,13 +63,13 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 userInfoVo.getSignature(),
                 userInfoVo.getAvatar(),
                 userInfoVo.getBackground(),
-                // TODO: 2021/5/14 用户身份二维码
-                null, null,// qr_code, qr_pic
+                userInfoVo.getQrCode(),
+                null,// qr_pic
                 userInfoVo.getTagMe(),
                 userInfoVo.getUid()
         );
-//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                SqlMapping.get(isNotComplete ? "adam_user_info.add" : "adam_user_info.edit", paramList.toArray()));
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get(userInfoVo.getIsComplete() == 0 ? "adam_user_info.add" : "adam_user_info.edit", paramList.toArray()));
 
         redisUtil.hset(AdamRedisConst.INFO_USER, userInfoVo.getUid(), userInfoVo);
     }

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

@@ -24,6 +24,7 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.result.UpdateResult;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -106,11 +107,11 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         userInfoVo.setUid(IDGenerator.nextSnowId() + "");
         userInfoVo.setIsComplete(0);
         userInfoVo.setState(1);
-        userInfoVo.setCreateAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
-
-//        boolean hset = redisUtil.hset(AdamRedisConst.INFO_MOBILES, userInfoVo.getMobile(), userInfoVo);
+        userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
+        userInfoVo.setCreateAt(DateUtil.getNowTime());
 
         Collection<AdamUserInfoVo> vos = mongoTemplate.insert(Collections.singletonList(userInfoVo), AdamUserInfoVo.class.getSimpleName());
+
         redisUtil.hset(AdamRedisConst.INFO_IDENTITY_MOBILE, mobile, userInfoVo.getUid());
 
         return userInfoVo;
@@ -129,6 +130,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
             userInfoVo.setMobile(param.getMobile());
             userInfoVo.setUid(IDGenerator.nextSnowId() + "");
+            userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
             userInfoVo.setCreateAt(nowStr);
 
             Collection<AdamUserInfoVo> userInfoVos = mongoTemplate.insert(Collections.singletonList(userInfoVo), AdamUserInfoVo.class);