提交代码，添加会员信息接口

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

+package com.liquidnet.service.adam.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+@ApiModel(value = "AdamMemberParam", description = "添加会员参数")
+@Data
+public class AdamMemberParam implements Serializable {
+    private static final long serialVersionUID = 5940725094369061032L;
+
+    /**
+     * 会员卡id
+     */
+    @ApiModelProperty(position = 0, required = false, value = "会员ID[50]")
+    private String memberId;
+
+    /**
+     * 会员卡名称
+     */
+    @ApiModelProperty(position = 1, required = false, value = "会员名称[50]", example = "摩登天空会员卡")
+    private String name;
+
+    /**
+     * 标题
+     */
+    @ApiModelProperty(position = 2, required = false, value = "会员标题[50]", example = "摩登天空会员卡")
+    private String title;
+
+    /**
+     * 副标题
+     */
+    @ApiModelProperty(position = 3, required = false, value = "会员副标题[50]", example = "摩登天空会员卡副标题")
+    private String subTitle;
+
+    /**
+     * 图标
+     */
+    @ApiModelProperty(position = 4, required = false, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
+    private String icon;
+
+    /**
+     * 头像
+     */
+    @ApiModelProperty(position = 5, required = false, value = "会员头像[200]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.pngv")
+    private String avatar;
+
+    /**
+     * 权益详情
+     */
+    private String interestsDetail;
+
+    /**
+     * 注意事项
+     */
+    private String notes;
+
+    /**
+     * '是否展示须知'
+     */
+    private Integer isNotice;
+
+    /**
+     * 须知内容
+     */
+    private String noticeInfo;
+
+    /**
+     * 须知标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 是否需要答题 0不需要 1需要
+     */
+    private Integer needQuestion;
+
+    /**
+     * 是否展示协议 0否1是
+     */
+    private Integer displayAgreement;
+
+    /**
+     * 会员协议
+     */
+    private String agreement;
+
+    /**
+     * 限购数量
+     */
+    private Integer limitation;
+}

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

@@ -14,7 +14,7 @@ public interface IAdamMemberService extends IService<AdamMember> {
 
     void add(AdamMember info);
 
-    AdamMember query(Integer mid);
+    AdamMember query(String mid);
 
     void edit(AdamMember info);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMember.java

@@ -19,6 +19,11 @@ public class AdamMember implements Serializable {
     @TableId(value = "mid", type = IdType.AUTO)
     private Integer mid;
 
+    /**
+     * 会员卡id
+     */
+    private String memberId;
+
     /**
      * 会员卡名称
      */
@@ -93,4 +98,9 @@ public class AdamMember implements Serializable {
      * 会员协议
      */
     private String agreement;
+
+    /**
+     * 限购数量
+     */
+    private Integer limitation;
 }

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

@@ -2,12 +2,15 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.adam.dto.AdamEntersParam;
+import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.service.IAdamMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,11 +28,24 @@ public class AdamMemberController {
     @ApiOperationSupport(order = 0)
     @ApiOperation(value = "会员信息")
     @GetMapping("info")
-    public ResponseDto<Object> query(@PathVariable(name = "id") Integer memberId) {
-
+    public ResponseDto<Object> query() {
+        String memberId = "1";
         AdamMember info = adamMemberService.query(memberId);
-
         return ResponseDto.success(info);
     }
 
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "添加会员")
+    @PostMapping("add")
+    public ResponseDto<Object> add(@RequestBody AdamMemberParam parameter) {
+        AdamMember adamMember = new AdamMember();
+        BeanUtils.copyProperties(parameter, adamMember);
+
+        adamMember.setLimitation(1000);
+        adamMember.setType(1);
+        adamMemberService.add(adamMember);
+
+        return ResponseDto.success();
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.mapper.AdamEntersMapper;
 import com.liquidnet.service.adam.service.IAdamEntersService;
@@ -42,7 +43,7 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
 
     @Override
     public List<AdamEnters> list(String uid) {
-        ç
+        List<AdamEnters> infoList = null;
 
         Map<Object, Object> map = redisUtil.hmget(AdamRedisConst.INFO_ENTERS.concat(uid));
 

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

@@ -61,7 +61,7 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
     }
 
     @Override
-    public AdamMember query(Integer mid) {
+    public AdamMember query(String mid) {
         AdamMember info = null;
         info = (AdamMember) redisUtil.hmget(AdamRedisConst.INFO_MEMBERS_INFO.concat(mid.toString()));
         if (null == info) {