+api.login添加member simple vo;

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

@@ -20,7 +20,9 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 14, value = "用户第三方账号信息")
     private List<AdamThirdPartInfoVo> thirdPartInfo;
     @ApiModelProperty(position = 15, value = "会员信息")
-    private AdamUserMemberVo memberInfo;
+    private AdamMemberSimpleVo memberSimpleVo;
+    @ApiModelProperty(position = 16, value = "用户会员信息")
+    private AdamUserMemberVo userMemberVo;
 
     private static final AdamLoginInfoVo obj = new AdamLoginInfoVo();
 

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

 package com.liquidnet.service.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 
@@ -9,4 +10,6 @@ import com.liquidnet.service.adam.entity.AdamMember;
  */
 public interface IAdamMemberService extends IService<AdamMember>  {
     AdamMemberVo queryMemberInfo();
+
+    AdamMemberSimpleVo queryMemberSimpleVo();
 }

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamMemberSimpleVo", description = "会员简述响应数据")
+@Data
+public class AdamMemberSimpleVo implements Serializable {
+    private static final long serialVersionUID = -3246848259206596250L;
+    @ApiModelProperty(position = 10, value = "会员ID[50]")
+    private String memberId;
+    @ApiModelProperty(position = 11, value = "会员名称[50]", example = "摩登天空会员卡")
+    private String name;
+    @ApiModelProperty(position = 12, value = "会员标题[50]", example = "摩登天空会员卡")
+    private String title;
+    @ApiModelProperty(position = 13, value = "会员副标题[50]", example = "摩登天空会员卡副标题")
+    private String subTitle;
+    @ApiModelProperty(position = 14, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
+    private String icon;
+}

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

@@ -14,10 +14,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 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.adam.service.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -61,6 +58,8 @@ public class AdamLoginController {
     IAdamThirdPartyService adamThirdPartyService;
     @Autowired
     IAdamUserMemberService adamUserMemberService;
+    @Autowired
+    IAdamMemberService adamMemberService;
 
     /*@ApiOperationSupport(order = 1)
     @ApiOperation(value = "手机号密码登录")
@@ -125,7 +124,8 @@ public class AdamLoginController {
 //        if (userInfoVo.getIsComplete() == 1) {
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(userInfoVo.getUid()));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(userInfoVo.getUid()));
-            loginInfoVo.setMemberInfo(adamUserMemberService.getUserMemberInfo(userInfoVo.getUid()));
+            loginInfoVo.setUserMemberVo(adamUserMemberService.getUserMemberInfo(userInfoVo.getUid()));
+            loginInfoVo.setMemberSimpleVo(adamMemberService.queryMemberSimpleVo());
 //        }
         loginInfoVo.setUserInfo(userInfoVo);
 
@@ -158,7 +158,8 @@ public class AdamLoginController {
 //        if (loginInfoVo.getUserInfo().getIsComplete() == 1) {
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(userInfoVo.getUid()));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(userInfoVo.getUid()));
-            loginInfoVo.setMemberInfo(adamUserMemberService.getUserMemberInfo(userInfoVo.getUid()));
+            loginInfoVo.setUserMemberVo(adamUserMemberService.getUserMemberInfo(userInfoVo.getUid()));
+            loginInfoVo.setMemberSimpleVo(adamMemberService.queryMemberSimpleVo());
 //        }
         loginInfoVo.setUserInfo(userInfoVo);
 
@@ -185,12 +186,14 @@ public class AdamLoginController {
             loginInfoVo.setUserInfo(adamUserService.queryByUid(uid));
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(uid));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(uid));
-            loginInfoVo.setMemberInfo(adamUserMemberService.getUserMemberInfo(uid));
+            loginInfoVo.setUserMemberVo(adamUserMemberService.getUserMemberInfo(uid));
+            loginInfoVo.setMemberSimpleVo(adamMemberService.queryMemberSimpleVo());
         } else {// 新账号注册
             if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) return ResponseDto.failure(ErrorMapping.get("10002"));
 
             loginInfoVo.setUserInfo(adamUserService.register(parameter));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(loginInfoVo.getUserInfo().getUid()));
+            loginInfoVo.setMemberSimpleVo(adamMemberService.queryMemberSimpleVo());
         }
 
         Map<String, Object> claimsMap = new HashMap<>();

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

@@ -57,7 +57,7 @@ public class AdamMemberController {
     }
 
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "判断是否会员")
+    @ApiOperation(value = "是否会员")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户ID[64]", example = "1"),
     })

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

@@ -91,8 +91,8 @@ public class AdamMemberOrderController {
     public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderCodeParam param) {
         try {
             param.setIp("127.0.0.1");
-            param.setSource("Android");
-            param.setVersion("5.5.5");
+            param.setSource(CurrentUtil.getCliSource());
+            param.setVersion(CurrentUtil.getCliVersion());
 
             AdamRealInfoVo realInfoVo = adamRealNameService.queryByUid(CurrentUtil.getCurrentUid());
             if (null == realInfoVo) {

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
+import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
@@ -16,13 +17,13 @@ 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.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 
-
 @Slf4j
 @Service
 public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMember> implements IAdamMemberService {
@@ -74,4 +75,18 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
         return info;
     }
 
+    @Override
+    public AdamMemberSimpleVo queryMemberSimpleVo() {
+        AdamMemberSimpleVo simpleVo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBERS);
+        if (null == simpleVo) {
+            List<AdamMemberSimpleVo> simpleVoList = mongoTemplate.findAll(AdamMemberSimpleVo.class, AdamMemberVo.class.getSimpleName());
+
+            simpleVo = CollectionUtils.isEmpty(simpleVoList) ? null : simpleVoList.get(0);
+
+            if (null != simpleVo) {
+                redisUtil.set(AdamRedisConst.INFO_MEMBERS, simpleVo);
+            }
+        }
+        return simpleVo;
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/pom.xml

@@ -30,10 +30,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
     </dependencies>