～会员信息API添加用户会员、会员权益逻辑；

+会员协议API；

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

@@ -62,7 +62,7 @@ public class AdamMemberParam implements Serializable {
     /**
      * '是否展示须知'
      */
-    @ApiModelProperty(position = 8, required = true, value = "是否展示须知[200]", example = "0")
+    @ApiModelProperty(position = 8, required = true, value = "是否展示须知[[0-否,1-是]]", allowableValues = "0,1")
     private Integer isNotice;
 
     /**
@@ -80,13 +80,13 @@ public class AdamMemberParam implements Serializable {
     /**
      * 是否需要答题 0不需要 1需要
      */
-    @ApiModelProperty(position = 11, required = true, value = "是否需要答题[200]", example = "0")
+    @ApiModelProperty(position = 11, required = true, value = "是否需要答题[0-否,1-是]", allowableValues = "0,1")
     private Integer needQuestion;
 
     /**
      * 是否展示协议 0否1是
      */
-    @ApiModelProperty(position = 12, required = true, value = "是否展示协议[200]", example = "0")
+    @ApiModelProperty(position = 12, required = true, value = "是否展示协议[0-否,1-是]", allowableValues = "0,1")
     private Integer displayAgreement;
 
     /**
@@ -101,6 +101,6 @@ public class AdamMemberParam implements Serializable {
     @ApiModelProperty(position = 14, required = true, value = "限购数量，0不限购[200]", example = "0")
     private Integer limitation;
 
-    @ApiModelProperty(position = 15, required = true, value = "会员卡价格ID", dataType = "List", example = "63666042953703424")
+    @ApiModelProperty(position = 15, required = true, value = "会员卡价格ID", example = "[63666042953703424]")
     private List<String> memberPriceList;
 }

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.List;
+
+@ApiModel(value = "AdamMemberRightsVo", description = "会员")
+@Data
+public class AdamMemberRightsVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = -2407106925001008460L;
+    @ApiModelProperty(position = 0, value = "权益封面[255]")
+    private String cover;
+    @ApiModelProperty(position = 1, value = "权益名称[10]")
+    private String name;
+    @ApiModelProperty(position = 2, value = "展示顺序[2]")
+    private Integer sort;
+
+    private static final AdamMemberRightsVo obj = new AdamMemberRightsVo();
+
+    public static AdamMemberRightsVo getNew() {
+        try {
+            return (AdamMemberRightsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamMemberRightsVo();
+    }
+
+    public AdamMemberRightsVo setCover(String cover) {
+        this.cover = cover;
+        return this;
+    }
+
+    public AdamMemberRightsVo setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public AdamMemberRightsVo setSort(Integer sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public List<AdamMemberRightsVo> initDefault() {
+        return Arrays.asList(AdamMemberRightsVo.getNew().setName("专属").setSort(1)
+                        .setCover("https://img.zhengzai.tv/files/2020/08/28/5f490c4477d72.png"),
+                AdamMemberRightsVo.getNew().setName("优惠").setSort(2)
+                        .setCover("https://img.zhengzai.tv/files/2020/08/28/5f490c685e7a8.png"),
+                AdamMemberRightsVo.getNew().setName("优先").setSort(3)
+                        .setCover("https://img.zhengzai.tv/files/2020/08/28/5f490c726a750.png"),
+                AdamMemberRightsVo.getNew().setName("专属").setSort(4)
+                        .setCover("https://img.zhengzai.tv/files/2020/08/28/5f490c5de2870.png")
+        );
+    }
+}

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

@@ -17,101 +17,44 @@ import java.util.List;
 @Data
 public class AdamMemberVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = 5258094625450569125L;
-
-    private static final AdamMemberVo obj = new AdamMemberVo();
-
-    /**
-     * 会员卡id
-     */
-    @ApiModelProperty(position = 0, required = false, value = "会员ID[50]")
+    @ApiModelProperty(position = 0, value = "会员ID[50]")
     private String memberId;
-
-    /**
-     * 会员卡名称
-     */
-    @ApiModelProperty(position = 1, required = false, value = "会员名称[50]", example = "摩登天空会员卡")
+    @ApiModelProperty(position = 1, value = "会员名称[50]", example = "摩登天空会员卡")
     private String name;
-
-    /**
-     * 标题
-     */
-    @ApiModelProperty(position = 2, required = true, value = "会员标题[50]", example = "摩登天空会员卡")
+    @ApiModelProperty(position = 2, value = "会员标题[50]", example = "摩登天空会员卡")
     private String title;
-
-    /**
-     * 副标题
-     */
-    @ApiModelProperty(position = 3, required = true, value = "会员副标题[50]", example = "摩登天空会员卡副标题")
+    @ApiModelProperty(position = 3, value = "会员副标题[50]", example = "摩登天空会员卡副标题")
     private String subTitle;
-
-    /**
-     * 图标
-     */
-    @ApiModelProperty(position = 4, required = true, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
+    @ApiModelProperty(position = 4, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
     private String icon;
-
-    /**
-     * 头像
-     */
-    @ApiModelProperty(position = 5, required = true, value = "会员头像[200]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.pngv")
+    @ApiModelProperty(position = 5, value = "会员头像[200]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.pngv")
     private String avatar;
-
-    /**
-     * 权益详情
-     */
-    @ApiModelProperty(position = 6, required = true, value = "权益详情[200]", example = "加入摩登天空会员您可享受到.....")
+    @ApiModelProperty(position = 6, value = "权益详情[200]", example = "加入摩登天空会员您可享受到.....")
     private String interestsDetail;
-
-    /**
-     * 注意事项
-     */
-    @ApiModelProperty(position = 7, required = true, value = "注意事项[200]", example = "摩登天空会员需注意以下事项.....")
+    @ApiModelProperty(position = 7, value = "注意事项[200]", example = "摩登天空会员需注意以下事项.....")
     private String notes;
-
-    /**
-     * '是否展示须知'
-     */
-    @ApiModelProperty(position = 8, required = true, value = "是否展示须知[200]", example = "0")
+    @ApiModelProperty(position = 8, value = "是否展示须知[200]", example = "0")
     private Integer isNotice;
-
-    /**
-     * 须知内容
-     */
-    @ApiModelProperty(position = 9, required = true, value = "会员须知内容[200]", example = "会员须知细则1.xxxx\n2.xxxx")
+    @ApiModelProperty(position = 9, value = "会员须知内容[200]", example = "会员须知细则1.xxxx\n2.xxxx")
     private String noticeInfo;
-
-    /**
-     * 须知标题
-     */
-    @ApiModelProperty(position = 10, required = true, value = "会员须知标题[200]", example = "摩登天空会员须知")
+    @ApiModelProperty(position = 10, value = "会员须知标题[200]", example = "摩登天空会员须知")
     private String noticeTitle;
-
-    /**
-     * 是否需要答题 0不需要 1需要
-     */
-    @ApiModelProperty(position = 11, required = true, value = "是否需要答题[200]", example = "0")
+    @ApiModelProperty(position = 11, value = "是否需要答题[200]", example = "0")
     private Integer needQuestion;
-
-    /**
-     * 是否展示协议 0否1是
-     */
-    @ApiModelProperty(position = 12, required = true, value = "是否展示协议[200]", example = "0")
+    @ApiModelProperty(position = 12, value = "是否展示协议[200]", example = "0")
     private Integer displayAgreement;
-
-    /**
-     * 会员协议
-     */
-    @ApiModelProperty(position = 13, required = true, value = "会员协议内容[200]", example = "摩登天空会员协议须知....")
-    private String agreement;
-
-    /**
-     * 限购数量
-     */
-    @ApiModelProperty(position = 14, required = true, value = "限购数量，0不限购[200]", example = "0")
+//    @ApiModelProperty(position = 13, value = "会员协议内容[200]", example = "摩登天空会员协议须知....")
+//    private String agreement;
+    @ApiModelProperty(position = 14, value = "限购数量，0不限购[200]", example = "0")
     private Integer limitation;
+    @ApiModelProperty(position = 15, value = "会员卡价格信息")
+    private List<AdamMemberPriceVo> priceVoList;
+    @ApiModelProperty(position = 16, value = "会员专属权益")
+    private List<AdamMemberRightsVo> rightsVoList;
+    @ApiModelProperty(position = 17, value = "用户会员信息")
+    private AdamUserMemberVo memberInfo;
 
-    @ApiModelProperty(position = 15, required = true, value = "会员卡价格ID", dataType = "List")
-    private List<AdamMemberPriceVo> adamMemberPrice;
+    private static final AdamMemberVo obj = new AdamMemberVo();
 
     public static AdamMemberVo getNew() {
         try {
@@ -128,7 +71,7 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
      * @return
      */
     @JsonIgnore
-    public List<AdamMemberPriceVo> setMemberPrice(List<AdamMemberPrice> adamMemberPrices){
+    public static List<AdamMemberPriceVo> setMemberPrice(List<AdamMemberPrice> adamMemberPrices){
         List<AdamMemberPriceVo> adamMemberPricesVo = new ArrayList<>();
         for (int i =0;i<adamMemberPrices.size();i++){
             AdamMemberPrice adamMemberPrice = adamMemberPrices.get(i);

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

@@ -111,7 +111,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
             return result;
         }
         // 验证价格是否有效
-        List<AdamMemberPriceVo> adamMemberPrice = adamMemberVo.getAdamMemberPrice();
+        List<AdamMemberPriceVo> adamMemberPrice = adamMemberVo.getPriceVoList();
         AdamMemberPriceVo priceVo = null;
         for (int i = 0; i < adamMemberPrice.size(); i++) {
             AdamMemberPriceVo adamMemberPriceVo = adamMemberPrice.get(i);

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

@@ -15,11 +15,12 @@ import org.springframework.beans.BeanUtils;
 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.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
 
 
 @Slf4j
@@ -38,6 +39,7 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
     @Autowired
     RedisUtil redisUtil;
 
+    // TODO: 2021/5/26 数据存取更正，不走MySql
     @Override
     public AdamMemberVo queryMemberInfo() {
         AdamMemberVo info = null;
@@ -65,7 +67,7 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
             memberPrice.add(tempMemberPrice);
         }
 
-        info.setAdamMemberPrice(memberPrice);
+        info.setPriceVoList(memberPrice);
         if (1 == tag) {
             mongoTemplate.insert(info, AdamMemberVo.class.getSimpleName());
         }

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

@@ -75,7 +75,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         BeanUtils.copyProperties(adamMember, amv);
 
         List<AdamMemberPrice> adamMemberPrices = adamMemberPriceMapper.memberPriceList(adamMember.getMemberId());
-        amv.setAdamMemberPrice((new AdamMemberVo()).setMemberPrice(adamMemberPrices));
+        amv.setPriceVoList(AdamMemberVo.setMemberPrice(adamMemberPrices));
 
         // 添加数据到 Mongo
         mongoTemplate.insert(Collections.singletonList(amv), AdamMemberVo.class.getSimpleName());