Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ErrorMapping.java

@@ -29,6 +29,11 @@ public class ErrorMapping {
         }
     }
 
+    public static ErrorMessage get(long code) {
+        String value = errorsProperties != null ? errorsProperties.getProperty(code + "") : "-";
+        return ErrorMessage.getInstance().setCode(code + "").setMessage(value);
+    }
+
     public static ErrorMessage get(String code) {
         String value = errorsProperties != null ? errorsProperties.getProperty(code) : "-";
         return ErrorMessage.getInstance().setCode(code).setMessage(value);

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ResponseDto.java

@@ -119,4 +119,8 @@ public class ResponseDto<T> implements Serializable, Cloneable {
         }
         return null;
     }
+
+    public String toJson() {
+        return JsonUtils.toJson(this);
+    }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml

@@ -96,7 +96,7 @@ global:
       /adam/login/mobile,
       /adam/login/tpa,
       /adam/send
-    url-pattern: /kylin/*
+    url-pattern: /kylin/**
 # -----------------------------------------------------------
 #解决错误 com.netflix.client.ClientException: Load balancer does not have available server for client:panfeng-item-service
 #这样就可以即指定path与URL，又不破坏Zuul的Hystrix与Ribbon特性了。

liquidnet-bus-service/liquidnet-api-feign/liquidnet-api-feign-kylin/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-api-feign</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-api-feign-kylin</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-kylin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

liquidnet-bus-service/liquidnet-api-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinPerformanceClient.java

+package com.liquidnet.service.feign.kylin.api;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import feign.hystrix.FallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Component
+@FeignClient(name = "liquidnet-service-kylin",
+        contextId = "", path = "",
+        fallback = FallbackFactory.Default.class)
+public interface FeignKylinPerformanceClient {
+
+    // 演出列表
+    @GetMapping(value =  "performance/list")
+    ResponseDto<List<PerformanceVo>> performanceList(@RequestParam String... performancesIds);
+}

liquidnet-bus-service/liquidnet-api-feign/pom.xml

@@ -12,6 +12,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>liquidnet-api-feign-adam</module>
+        <module>liquidnet-api-feign-kylin</module>
 <!--        <module>liquidnet-api-feign-sequence</module>-->
 <!--        <module>liquidnet-api-feign-example</module>-->
 <!--        <module>liquidnet-api-feign-account</module>-->

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

@@ -9,7 +9,7 @@ import lombok.Data;
 public class AdamAddressesParam implements java.io.Serializable {
     private static final long serialVersionUID = -2626425843975309892L;
     @ApiModelProperty(position = 10, required = false, value = "收获地址ID，编辑时必传[64]")
-    private String addrId;
+    private String addressesId;
     @ApiModelProperty(position = 11, required = true, value = "入场人名称[50]", example = "Swagger")
     private String name;
     @ApiModelProperty(position = 12, required = true, value = "手机号[11]", example = "13111111111")

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

@@ -6,7 +6,7 @@ import lombok.Data;
 
 @ApiModel(value = "AdamCollectParam", description = "添加收藏入参")
 @Data
-public class AdamCollectParam implements java.io.Serializable {
+public class AdamDisposedParam implements java.io.Serializable {
     private static final long serialVersionUID = 7397579764049783649L;
     @ApiModelProperty(position = 11, required = true, value = "内容ID[64]", example = "Swagger")
     private String contentId;
@@ -14,7 +14,7 @@ public class AdamCollectParam implements java.io.Serializable {
     private String type;
     @ApiModelProperty(position = 13, required = true, value = "内容标题[255]", example = "13111111111")
     private String contentTitle;
-    @ApiModelProperty(position = 14, required = true, value = "内容快照[30]", example = "北京")
+    @ApiModelProperty(position = 14, required = true, value = "内容快照[255]", example = "北京")
     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/AdamThirdPartParam.java

@@ -13,7 +13,7 @@ public class AdamThirdPartParam implements Serializable {
     @ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
     private String openId;
     @ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
-    private String nickName;
+    private String nickname;
     @ApiModelProperty(position = 13, required = true, value = "头像[255]", example = "http://pic.zhengzai.tv/default/avatar.png")
     private String avatar;
     @ApiModelProperty(position = 14, required = true, value = "平台类型[255]", allowableValues = "WEIBO,WECHAT,QQ")

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

 package com.liquidnet.service.adam.dto;
 
+import com.liquidnet.service.adam.dto.vo.AdamTagParentVo;
+import com.liquidnet.service.adam.dto.vo.AdamTagVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel(value = "AdamUserInfoParam", description = "个人资料编辑参数")
 @Data
 public class AdamUserInfoParam implements java.io.Serializable {
     private static final long serialVersionUID = -1084524066864012398L;
-    @ApiModelProperty(position = 11, required = true, value = "头像[255]")
+    @ApiModelProperty(position = 11, required = true, value = "头像[255]", example = "http://pic.zhengzai.tv/default/avatar.png")
     private String avatar;
-    @ApiModelProperty(position = 12, required = true, value = "背景[255]")
+    @ApiModelProperty(position = 12, required = true, value = "背景[255]", example = "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png")
     private String background;
-    @ApiModelProperty(position = 13, required = true, value = "昵称[32]")
-    private String nickName;
-    @ApiModelProperty(position = 14, required = true, value = "性别[32]")
-    private String sex;
-    @ApiModelProperty(position = 15, required = true, value = "生日[YYYY-MM-DD]")
+    @ApiModelProperty(position = 13, required = true, value = "昵称[32]", example = "Swagger")
+    private String nickname;
+    @ApiModelProperty(position = 14, required = true, value = "性别[32]", example = "{\"val\":\"MS00\",\"desc\":\"其他性别\"}")
+    private AdamTagVo sex;
+    @ApiModelProperty(position = 15, required = true, value = "生日[YYYY-MM-DD]", example = "2021-05-17")
     private String birthday;
-    @ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]")
+    @ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]", example = "北京 北京市 朝阳区")
     private String area;
-    @ApiModelProperty(position = 17, required = true, value = "签名[255]")
+    @ApiModelProperty(position = 17, required = true, value = "签名[255]", example = "...................")
     private String signature;
-    @ApiModelProperty(position = 18, required = true, value = "标签[500]")
-    private String tagMe;
+    @ApiModelProperty(position = 18, required = true, value = "标签[500]", example = "[{\"val\":\"MMS01\",\"desc\":\"民歌\",\"tagVos\":[{\"val\":\"MMS0101\",\"desc\":\"A\"},{\"val\":\"MMS0102\",\"desc\":\"B\"}]},{\"val\":\"MMS02\",\"desc\":\"house\",\"tagVos\":[{\"val\":\"MMS0201\",\"desc\":\"C\"}]}]")
+    private List<AdamTagParentVo> tagMe;
 }

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

 package com.liquidnet.service.adam.dto.vo;
 
 import com.liquidnet.service.adam.entity.AdamAddresses;
-import com.liquidnet.service.adam.entity.AdamEnters;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +10,7 @@ import lombok.Data;
 public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = 5258094625450569125L;
     @ApiModelProperty(position = 10, value = "收获地址ID[64]")
-    private String addrId;
+    private String addressesId;
     @ApiModelProperty(position = 11, value = "姓名[30]")
     private String name;
     @ApiModelProperty(position = 12, value = "手机号[11]")
@@ -39,7 +38,7 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     }
 
     public AdamAddressesVo copy(AdamAddresses source) {
-        this.setAddrId(source.getAddressesId());
+        this.setAddressesId(source.getAddressesId());
         this.setName(source.getName());
         this.setPhone(source.getPhone());
         this.setProvince(source.getProvince());

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

+package com.liquidnet.service.adam.dto.vo;
+
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamCollectBaseVo", description = "收藏基础数据")
+@Data
+public class AdamCollectBaseVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -5478569736722226136L;
+    @ApiModelProperty(position = 10, value = "用户ID[64]")
+    private String uid;
+    @ApiModelProperty(position = 11, value = "用户头像[255]")
+    private String avatar;
+    @ApiModelProperty(position = 12, value = "用户昵称[32]")
+    private String nickname;
+    @ApiModelProperty(position = 13, value = "用户性别[32]")
+    private AdamTagVo sex;
+    @ApiModelProperty(position = 14, value = "内容ID[64]")
+    private String contentId;
+    @ApiModelProperty(position = 15, value = "内容类型")
+    private String type;
+    @ApiModelProperty(position = 16, value = "内容类型")
+    private Integer state;
+    @ApiModelProperty(position = 17, value = "收藏时间")
+    private String createdAt;
+    @ApiModelProperty(position = 18, value = "更新时间")
+    private String updatedAt;
+    @ApiModelProperty(position = 19, value = "展示信息")
+    private PerformanceVo contentInfo;
+
+    private static final AdamCollectBaseVo obj = new AdamCollectBaseVo();
+
+    public static AdamCollectBaseVo getNew() {
+        try {
+            return (AdamCollectBaseVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamCollectBaseVo();
+        }
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamCollectVo", description = "收藏信息")
+@Data
+public class AdamCollectVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 3222644230886542725L;
+    @ApiModelProperty(position = 11, required = true, value = "内容ID[64]")
+    private String contentId;
+    @ApiModelProperty(position = 12, required = true, value = "内容类型")
+    private String type;
+    @ApiModelProperty(position = 13, required = true, value = "收藏时间")
+    private String createdAt;
+    @ApiModelProperty(position = 14, required = true, value = "展示信息")
+    private PerformanceVo contentInfo;
+
+    private static final AdamCollectVo obj = new AdamCollectVo();
+
+    public static AdamCollectVo getNew() {
+        try {
+            return (AdamCollectVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamCollectVo();
+        }
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamDisposedBaseVo", description = "想去基础数据")
+@Data
+public class AdamDisposedBaseVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -5478569736722226136L;
+    @ApiModelProperty(position = 10, value = "用户ID[64]")
+    private String uid;
+    @ApiModelProperty(position = 11, value = "用户头像[255]")
+    private String avatar;
+    @ApiModelProperty(position = 12, value = "用户昵称[32]")
+    private String nickname;
+    @ApiModelProperty(position = 13, value = "用户性别[32]")
+    private AdamTagVo sex;
+    @ApiModelProperty(position = 14, value = "内容ID[64]")
+    private String contentId;
+    @ApiModelProperty(position = 15, value = "内容类型")
+    private String type;
+    @ApiModelProperty(position = 16, value = "内容类型")
+    private Integer state;
+    @ApiModelProperty(position = 17, value = "收藏时间")
+    private String createdAt;
+    @ApiModelProperty(position = 18, value = "更新时间")
+    private String updatedAt;
+    @ApiModelProperty(position = 19, value = "展示信息")
+    private PerformanceVo contentInfo;
+
+    private static final AdamDisposedBaseVo obj = new AdamDisposedBaseVo();
+
+    public static AdamDisposedBaseVo getNew() {
+        try {
+            return (AdamDisposedBaseVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamDisposedBaseVo();
+        }
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamDisposedVo", description = "想去信息")
+@Data
+public class AdamDisposedVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 3222644230886542725L;
+    @ApiModelProperty(position = 11, required = true, value = "内容ID[64]")
+    private String contentId;
+    @ApiModelProperty(position = 12, required = true, value = "内容类型")
+    private String type;
+    @ApiModelProperty(position = 13, required = true, value = "标记时间")
+    private String createdAt;
+    @ApiModelProperty(position = 14, required = true, value = "展示信息")
+    private PerformanceVo contentInfo;
+
+    private static final AdamDisposedVo obj = new AdamDisposedVo();
+
+    public static AdamDisposedVo getNew() {
+        try {
+            return (AdamDisposedVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamDisposedVo();
+        }
+    }
+}

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/AdamTagParentVo.java

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "AdamTagParentVo", description = "父级标签库")
+public class AdamTagParentVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -7965840594354555093L;
+    @ApiModelProperty(position = 11, value = "标签Key")
+    private String val;
+    @ApiModelProperty(position = 12, value = "标签名称")
+    private String desc;
+    @ApiModelProperty(position = 13, value = "子标签列表")
+    private List<AdamTagVo> tagVos;
+
+    private static final AdamTagParentVo obj = new AdamTagParentVo();
+
+    public static AdamTagParentVo getNew() {
+        try {
+            return (AdamTagParentVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamTagParentVo();
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public AdamTagParentVo setVal(String val) {
+        this.val = val;
+        return this;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public AdamTagParentVo setDesc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+
+    public List<AdamTagVo> getTagVos() {
+        return tagVos;
+    }
+
+    public AdamTagParentVo setTagVos(List<AdamTagVo> tagVos) {
+        this.tagVos = tagVos;
+        return this;
+    }
+}

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamTagVo", description = "标签库")
+public class AdamTagVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 5852327873275898342L;
+    @ApiModelProperty(position = 11, value = "标签Key")
+    private String val;
+    @ApiModelProperty(position = 12, value = "标签名称")
+    private String desc;
+
+    private static final AdamTagVo obj = new AdamTagVo();
+
+    public static AdamTagVo getNew() {
+        try {
+            return (AdamTagVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamTagVo();
+    }
+
+    public String getVal() {
+        return val;
+    }
+
+    public AdamTagVo setVal(String val) {
+        this.val = val;
+        return this;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public AdamTagVo setDesc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+}

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel(value = "AdamUserInfoVo", description = "用户详情")
 @Data
 public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
@@ -13,11 +15,11 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 11, value = "手机号[20]")
     private String mobile;
     @ApiModelProperty(position = 12, value = "昵称[32]")
-    private String nickName;
+    private String nickname;
     @ApiModelProperty(position = 13, value = "状态[1-正常,2-注销]")
     private Integer state;
     @ApiModelProperty(position = 14, value = "性别[32]")
-    private String sex;
+    private AdamTagVo sex;
     @ApiModelProperty(position = 15, value = "生日[YYYY-MM-DD]")
     private String birthday;
     @ApiModelProperty(position = 16, value = "常住地/区域")
@@ -29,7 +31,7 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 19, value = "背景图")
     private String background;
     @ApiModelProperty(position = 20, value = "标签")
-    private String tagMe;
+    private List<AdamTagParentVo> tagMe;
     @ApiModelProperty(position = 21, value = "注册时间")
     private String createAt;
     @ApiModelProperty(position = 22, value = "最近一次更新时间")
@@ -38,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.github.pagehelper.PageInfo;
+import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
+import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.adam.entity.AdamCollection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +16,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAdamCollectionService extends IService<AdamCollection> {
 
+    void add(AdamCollectBaseVo collectVo);
+
+    AdamCollectBaseVo query(String uid, String type, String contentId);
+
+    void del(String uid, String type, String contentId);
+
+    boolean queryState(String uid, String type, String contentId);
+
+    PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize);
 }

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

+package com.liquidnet.service.adam.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
+import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
+import com.liquidnet.service.adam.entity.AdamDisposed;
+
+/**
+ * <p>
+ * 想去 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+public interface IAdamDisposedService extends IService<AdamDisposed> {
+
+    void add(AdamDisposedBaseVo disposedBaseVo);
+
+    AdamDisposedBaseVo query(String uid, String type, String contentId);
+
+    void del(String uid, String type, String contentId);
+
+    boolean queryState(String uid, String type, String contentId);
+
+    PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize);
+}

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;
@@ -45,9 +46,8 @@ public interface IAdamUserService extends IService<AdamUser> {
      *
      * @param uid
      * @param param
-     * @return List<AdamThirdPartInfoVo>
      */
-    List<AdamThirdPartInfoVo> bindTpa(String uid, AdamThirdPartParam param);
+    void bindTpa(String uid, AdamThirdPartParam param);
 
     /**
      * 第三方账号绑定（存在已绑定账号）
@@ -69,4 +69,6 @@ public interface IAdamUserService extends IService<AdamUser> {
     List<AdamThirdPartInfoVo> unBindTpa(String uid, String platform);
 
     void close(String uid);
+
+    AdamRealInfoVo identity(String uid, String name, String idCard);
 }

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

@@ -28,14 +28,8 @@ public class AdamCollection implements Serializable {
 
     private String contentId;
 
-    private String contentTitle;
-
-    private String contentImg;
-
-    private Long duration;
-
     /**
-     * 收藏类型
+     * 收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG
      */
     private String type;
 

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

+package com.liquidnet.service.adam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 想去
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamDisposed implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    private String uid;
+
+    private Integer contentId;
+
+    /**
+     * 想去类型:TICKET
+     */
+    private String type;
+
+    /**
+     * 1-正常,2-删除
+     */
+    private Integer state;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private String comment;
+
+
+}

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

@@ -39,7 +39,7 @@ public class AdamThirdParty implements Serializable {
     /**
      * 第三方昵称
      */
-    private String nickName;
+    private String nickname;
 
     /**
      * 平台名称

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

@@ -29,7 +29,7 @@ public class AdamUserInfo implements Serializable {
     /**
      * 昵称
      */
-    private String nickName;
+    private String nickname;
 
     /**
      * 性别

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamDisposedMapper.java

+package com.liquidnet.service.adam.mapper;
+
+import com.liquidnet.service.adam.entity.AdamDisposed;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 想去 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-19
+ */
+public interface AdamDisposedMapper extends BaseMapper<AdamDisposed> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamDisposedMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamDisposedMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -9,7 +9,7 @@ create table adam_third_party
     uid        varchar(64) default '',
     open_id    varchar(64) comment '第三方ID',
     avatar     varchar(255) comment '第三方头像',
-    nick_name  varchar(64) comment '第三方昵称',
+    nickname   varchar(64) comment '第三方昵称',
     platform   varchar(20) comment '平台名称',
     state      tinyint comment '0-INIT,1-NORMAL,2-INVALID',
     created_at datetime,
@@ -72,7 +72,7 @@ create table adam_user_info
 (
     mid        int unsigned auto_increment primary key,
     uid        varchar(64) not null,
-    nick_name  varchar(32) comment '昵称',
+    nickname   varchar(32) comment '昵称',
     sex        varchar(32) comment '性别',
     birthday   date comment '生日YYYY-MM-DD',
     area       varchar(100) comment '常住地/区域',
@@ -176,10 +176,7 @@ create table adam_collection
 (
     mid           int unsigned auto_increment primary key,
     uid           varchar(64)       not null,
-    content_id    varchar(64),
-    content_title varchar(255),
-    content_img   varchar(255),
-    duration      bigint  default 0 not null,
+    content_id    varchar(64)       not null,
     type          varchar(30)       not null comment '收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG',
     state         tinyint default 1 not null comment '1-正常,2-删除',
     created_at    datetime          not null,
@@ -194,15 +191,12 @@ create table adam_disposed
 (
     mid           int unsigned auto_increment not null primary key,
     uid           varchar(64)                 not null,
-    #     nickname      varchar(32)                                                                                    default '',
-    #     avatar        varchar(255)                                                                                   default '',
-    content_id    int unsigned,
-    content_title varchar(255),
-    content_img   varchar(255),
-    type          varchar(30)                 not null comment '收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG',
-    status        tinyint default 1           not null comment '1正常 2删除',
+    content_id    int unsigned                not null,
+    type          varchar(30)                 not null comment '想去类型:TICKET',
+    state         tinyint default 1           not null comment '1-正常,2-删除',
     created_at    datetime                    not null,
-    updated_at    datetime
+    updated_at    datetime,
+    comment       text
 ) engine = InnoDB comment '想去';
 create index idx_disposed_uid on adam_disposed (uid);
 create index idx_disposed_content on adam_disposed (content_id);
@@ -251,27 +245,27 @@ create table adam_member_price
 drop table if exists adam_member_order;
 create table adam_member_order
 (
-    mid         int unsigned auto_increment primary key,
-    order_no    varchar(64),
-    uid         varchar(64),
-    mode        tinyint comment '购买方式:0-购买会员 1-购买会员码,2-使用会员码',
-    price       decimal(8, 2) comment '原价',
-    price_paid  decimal(8, 2) comment '实际支付',
-    member_name varchar(64),
-    member_id   varchar(255) comment '会员id',
+    mid             int unsigned auto_increment primary key,
+    order_no        varchar(64),
+    uid             varchar(64),
+    mode            tinyint comment '购买方式:0-购买会员 1-购买会员码,2-使用会员码',
+    price           decimal(8, 2) comment '原价',
+    price_paid      decimal(8, 2) comment '实际支付',
+    member_name     varchar(64),
+    member_id       varchar(255) comment '会员id',
     member_price_id varchar(255) comment '会员价格id',
-    days int default 0 comment '购买天数',
-    state       tinyint comment '订单状态',
-    member_no   varchar(20) comment '会员号',
-    pay_channel varchar(20) comment '支付渠道',
-    pay_no      varchar(64) comment '支付订单',
-    birthday    date default null comment '用户生日',
-    payment_at  datetime default null comment '支付时间',
-    created_at  datetime,
-    updated_at  datetime,
-    client_ip   varchar(20),
-    source      varchar(20),
-    version     varchar(20)
+    days            int      default 0 comment '购买天数',
+    state           tinyint comment '订单状态',
+    member_no       varchar(20) comment '会员号',
+    pay_channel     varchar(20) comment '支付渠道',
+    pay_no          varchar(64) comment '支付订单',
+    birthday        date     default null comment '用户生日',
+    payment_at      datetime default null comment '支付时间',
+    created_at      datetime,
+    updated_at      datetime,
+    client_ip       varchar(20),
+    source          varchar(20),
+    version         varchar(20)
 );
 -- >>------------------------------------------------------------------------------------
 drop table if exists adam_user_member;
@@ -279,7 +273,7 @@ create table adam_user_member
 (
     mid        int unsigned auto_increment primary key,
     uid        varchar(64)  not null,
-    member_id   varchar(255) comment '会员类型id',
+    member_id  varchar(255) comment '会员类型id',
     member_no  int unsigned not null,
     state      tinyint comment '1-NORMAL,2-INVALID',
     expiry_at  datetime comment '到期日期',
@@ -290,21 +284,21 @@ create table adam_user_member
 drop table if exists adam_member_code;
 create table adam_member_code
 (
-    mid          int unsigned auto_increment primary key,
-    code         varchar(20) comment '会员码',
-    type         int default 0 comment '0用户购买1提前制作',
-    member_id    varchar(255) comment '会员ID',
-    member_price_id    varchar(255) comment '会员价格ID',
-    member_no    varchar(20) comment '预留会员号',
-    state        tinyint comment '0-未用,1-已用,2-失效',
-    created_at   datetime,
-    updated_at   datetime,
-    buy_order_no varchar(255) default null comment '购买会员码订单号',
-    buy_uid      varchar(255) default null comment '购买会员码用户id',
-    buy_at       datetime default null comment '购买时间',
-    use_order_no varchar(64) default null comment '消费订单号',
-    use_uid      varchar(64) default null comment '消费用户ID',
-    use_at       datetime default null
+    mid             int unsigned auto_increment primary key,
+    code            varchar(20) comment '会员码',
+    type            int          default 0 comment '0用户购买1提前制作',
+    member_id       varchar(255) comment '会员ID',
+    member_price_id varchar(255) comment '会员价格ID',
+    member_no       varchar(20) comment '预留会员号',
+    state           tinyint comment '0-未用,1-已用,2-失效',
+    created_at      datetime,
+    updated_at      datetime,
+    buy_order_no    varchar(255) default null comment '购买会员码订单号',
+    buy_uid         varchar(255) default null comment '购买会员码用户id',
+    buy_at          datetime     default null comment '购买时间',
+    use_order_no    varchar(64)  default null comment '消费订单号',
+    use_uid         varchar(64)  default null comment '消费用户ID',
+    use_at          datetime     default null
 );
 -- >>------------------------------------------------------------------------------------
 -- >>------------------------------------------------------------------------------------

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

@@ -3,13 +3,17 @@ package com.liquidnet.service.adam.controller;
 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.AdamCollectBaseVo;
+import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
+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;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -26,16 +30,24 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("collect")
 public class AdamCollectionController {
+    @Autowired
+    IAdamCollectionService adamCollectionService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加收藏")
     @PostMapping("add")
-    public ResponseDto<Object> add(@RequestBody AdamCollectParam parameter) {
-        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
-        String uid = "1";
+    public ResponseDto<Object> add(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验
+        String currentUid = CurrentUtil.getCurrentUid();
 
-        // TODO: 2021/5/10
+        AdamCollectBaseVo existVo = adamCollectionService.query(currentUid, type, contentId);
+        if (null != existVo) return ResponseDto.success();
 
+        AdamCollectBaseVo collectVo = AdamCollectBaseVo.getNew();
+        collectVo.setType(type);
+        collectVo.setContentId(contentId);
+        collectVo.setUid(currentUid);
+        adamCollectionService.add(collectVo);
 
         return ResponseDto.success();
     }
@@ -48,49 +60,48 @@ public class AdamCollectionController {
     })
     @PostMapping("del")
     public ResponseDto<Object> del(@RequestParam String type, @RequestParam String contentId) {
-        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
-        String uid = "1";
-
-        // TODO: 2021/5/10
+        // TODO: 2021/4/28 数据校验
 
+        adamCollectionService.del(CurrentUtil.getCurrentUid(), type, contentId);
 
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "收藏列表 -> 返回结构待定:遵循原PHP.API查询Collection内容")
+    @ApiOperation(value = "收藏列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNum", value = "页展示条数"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页码"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageNo", value = "页码", example = "1"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
     })
     @PostMapping("list")
-    public ResponseDto<PageInfo> list(@RequestParam String type, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "10") int pageSize) {
-        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
-        String uid = "1";
-
-        // TODO: 2021/5/10
+    public ResponseDto<PageInfo<AdamCollectVo>> list(@RequestParam String type,
+                                                     @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                     @RequestParam(defaultValue = "5", required = false) int pageSize) {
+        // TODO: 2021/4/28 数据校验
 
+        pageNo = pageNo > 0 ? pageNo : 1;
+        pageSize = pageSize <= 0 || pageSize > 10 ? 5 : pageSize;
 
-        return ResponseDto.success();
+        return ResponseDto.success(adamCollectionService.queryPage(CurrentUtil.getCurrentUid(), type, pageNo, pageSize));
     }
 
-    @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "获取特定内容的收藏用户列表 -> 返回结构待定")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
-    })
-    @PostMapping("list/user")
-    public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId) {
-        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
-        String uid = "1";
-
-        // TODO: 2021/5/10
-
-
-        return ResponseDto.success();
-    }
+//    @ApiOperationSupport(order = 4)
+//    @ApiOperation(value = "获取特定内容的收藏用户列表 -> 返回结构待定")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+//    })
+//    @PostMapping("list/user")
+//    public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId) {
+//        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+//        String uid = "1";
+//
+//        // TODO: 2021/5/10
+//
+//
+//        return ResponseDto.success();
+//    }
 
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "获取收藏状态")
@@ -99,13 +110,8 @@ public class AdamCollectionController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
     })
     @GetMapping("state")
-    public ResponseDto<Object> state(@RequestParam String type, @RequestParam String contentId) {
-        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
-        String uid = "1";
-
-        // TODO: 2021/5/10
-
-
-        return ResponseDto.success();
+    public ResponseDto<Boolean> state(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验
+        return ResponseDto.success(adamCollectionService.queryState(CurrentUtil.getCurrentUid(), type, contentId));
     }
 }

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

+package com.liquidnet.service.adam.controller;
+
+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.AdamCollectBaseVo;
+import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
+import com.liquidnet.service.adam.service.IAdamDisposedService;
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 收藏 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-10
+ */
+@ApiSupport(order = 10050)
+@Api(tags = "想去")
+@Slf4j
+@RestController
+@RequestMapping("disposed")
+public class AdamDisposedController {
+    @Autowired
+    IAdamDisposedService adamDisposedService;
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "添加")
+    @PostMapping("add")
+    public ResponseDto<Object> add(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验
+        String currentUid = CurrentUtil.getCurrentUid();
+
+        AdamDisposedBaseVo existVo = adamDisposedService.query(currentUid, type, contentId);
+        if (null != existVo) return ResponseDto.success();
+
+        AdamDisposedBaseVo disposedBaseVo = AdamDisposedBaseVo.getNew();
+        disposedBaseVo.setType(type);
+        disposedBaseVo.setContentId(contentId);
+        disposedBaseVo.setUid(currentUid);
+
+        adamDisposedService.add(disposedBaseVo);
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+    })
+    @PostMapping("del")
+    public ResponseDto<Object> del(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验
+
+        adamDisposedService.del(CurrentUtil.getCurrentUid(), type, contentId);
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "想去列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageNo", value = "页码", example = "1"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
+    })
+    @PostMapping("list")
+    public ResponseDto<PageInfo> list(@RequestParam String type,
+                                      @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                      @RequestParam(defaultValue = "5", required = false) int pageSize) {
+        // TODO: 2021/4/28 数据校验
+
+        pageNo = pageNo > 0 ? pageNo : 1;
+        pageSize = pageSize <= 0 || pageSize > 10 ? 5 : pageSize;
+
+        return ResponseDto.success(adamDisposedService.queryPage(CurrentUtil.getCurrentUid(), type, pageNo, pageSize));
+    }
+
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "获取特定内容的想去用户列表 -> 返回结构待定")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+    })
+    @PostMapping("list/user")
+    public ResponseDto<Object> listUser(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "获取想去状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "收藏类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
+    })
+    @GetMapping("state")
+    public ResponseDto<Object> state(@RequestParam String type, @RequestParam String contentId) {
+        // TODO: 2021/4/28 数据校验、身份认证、获取登录UID
+        String uid = "1";
+
+        // TODO: 2021/5/10
+
+
+        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,15 +104,15 @@ 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) {
         // TODO: 2021/5/12 参数检验
-        log.info("mobile:{},pwd:{}", mobile, code);
+        log.info("mobile:{},code:{}", mobile, code);
 
-        if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure("验证码无效");
+        if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure(ErrorMapping.get("10002"));
 
         String uid = adamUserService.queryUidByRedis(mobile);
         AdamUserInfoVo userInfoVo =
@@ -143,7 +143,7 @@ public class AdamLoginController {
         log.info("login by mobile access token:{}", accessToken);
 
         String mobile = this.getMobile(accessToken);
-        if (StringUtils.isEmpty(mobile)) return ResponseDto.failure("手机号获取失败，请更换登录方式");
+        if (StringUtils.isEmpty(mobile)) return ResponseDto.failure(ErrorMapping.get("10005"));
 
         String uid = adamUserService.queryUidByRedis(mobile);
         AdamUserInfoVo userInfoVo =
@@ -173,13 +173,13 @@ public class AdamLoginController {
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (StringUtils.isEmpty(parameter.getMobile())) {
             String uid = adamUserService.queryUidByRedis(parameter.getOpenId(), parameter.getPlatform());
-            if (StringUtils.isEmpty(uid)) return ResponseDto.failure("第三方账号未注册");
+            if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
 
             loginInfoVo.setUserInfo(adamUserService.queryByUid(uid));
             loginInfoVo.setRealNameInfo(adamRealNameService.queryByUid(uid));
             loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(uid));
         } else {// 新账号注册
-            if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) return ResponseDto.failure("验证码无效");
+            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()));
@@ -193,12 +193,13 @@ public class AdamLoginController {
 
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "登出")
-    @PostMapping(value = {"logout"})
+    @PostMapping(value = {"out"})
     public ResponseDto<Object> logout(HttpServletRequest request) {
-        String authorization = request.getHeader("authorization");
+        String uToken = request.getHeader(CurrentUtil.uToken);
+        log.info("###logout:uid:{}\ntoken:{}\nuToken:{}", CurrentUtil.getCurrentUid(), CurrentUtil.getToken(), uToken);
 
         String ssoKey = jwtValidator.getSsoRedisKey().concat(
-                DigestUtils.md5DigestAsHex(authorization.substring(7).getBytes(StandardCharsets.UTF_8))
+                DigestUtils.md5DigestAsHex(uToken.getBytes(StandardCharsets.UTF_8))
         );
 
         redisUtil.set(ssoKey, false);
@@ -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,8 +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.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;
@@ -26,8 +26,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @ApiSupport(order = 10020)
 @Api(tags = "用户中心")
@@ -43,6 +42,8 @@ public class AdamUserController {
     IAdamUserInfoService adamUserInfoService;
     @Autowired
     IAdamThirdPartyService adamThirdPartyService;
+    @Autowired
+    IAdamRealNameService adamRealNameService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "个人资料编辑")
@@ -55,12 +56,13 @@ public class AdamUserController {
         AdamUserInfoVo editUserInfoVo = adamUserService.queryByUid(currentUid);
         editUserInfoVo.setAvatar(parameter.getAvatar());
         editUserInfoVo.setBackground(parameter.getBackground());
-        editUserInfoVo.setNickName(parameter.getNickName());
+        editUserInfoVo.setNickname(parameter.getNickname());
         editUserInfoVo.setSex(parameter.getSex());
         editUserInfoVo.setBirthday(parameter.getBirthday());
         editUserInfoVo.setArea(parameter.getArea());
         editUserInfoVo.setSignature(parameter.getSignature());
         editUserInfoVo.setTagMe(parameter.getTagMe());
+        editUserInfoVo.setIsComplete(1);
         editUserInfoVo.setUpdatedAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
 
         adamUserInfoService.edit(editUserInfoVo);
@@ -69,6 +71,58 @@ public class AdamUserController {
     }
 
     @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "音乐风格")
+    @GetMapping(value = {"tag/ms"})
+    public ResponseDto<List<AdamTagParentVo>> getMsTag() {
+        List<AdamTagParentVo> tagMsVoList = new ArrayList<>();
+        tagMsVoList.add(AdamTagParentVo.getNew().setVal("MMS01").setDesc("民歌").setTagVos(Arrays.asList(
+                AdamTagVo.getNew().setVal("MMS0101").setDesc("A"),
+                AdamTagVo.getNew().setVal("MMS0102").setDesc("B")
+        )));
+        tagMsVoList.add(AdamTagParentVo.getNew().setVal("MMS02").setDesc("house").setTagVos(Arrays.asList(
+                AdamTagVo.getNew().setVal("MMS0201").setDesc("C"),
+                AdamTagVo.getNew().setVal("MMS0202").setDesc("D")
+        )));
+        tagMsVoList.add(AdamTagParentVo.getNew().setVal("MMS03").setDesc("R&B").setTagVos(Arrays.asList(
+                AdamTagVo.getNew().setVal("MMS0301").setDesc("E"),
+                AdamTagVo.getNew().setVal("MMS0302").setDesc("F")
+        )));
+        return ResponseDto.success(tagMsVoList);
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "性别列表")
+    @GetMapping(value = {"tag/sex"})
+    public ResponseDto<List<AdamTagVo>> getSexTag() {
+        List<AdamTagVo> tagSexVoList = new ArrayList<>();
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS00").setDesc("其他性别"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS01").setDesc("男性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS02").setDesc("女性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS03").setDesc("跨性别女性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS04").setDesc("跨性别男性"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS05").setDesc("双性别者"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS06").setDesc("性别模糊"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS07").setDesc("性别流动"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS08").setDesc("无性别者"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS09").setDesc("不确定性别"));
+        tagSexVoList.add(AdamTagVo.getNew().setVal("MS10").setDesc("不在乎性别"));
+        return ResponseDto.success(tagSexVoList);
+//        Map<String, String> tagSexVos = new HashMap<>();
+//        tagSexVos.put("MS00", "其他性别");
+//        tagSexVos.put("MS01", "男性");
+//        tagSexVos.put("MS02", "女性");
+//        tagSexVos.put("MS03", "跨性别女性");
+//        tagSexVos.put("MS04", "跨性别男性");
+//        tagSexVos.put("MS05", "双性别者");
+//        tagSexVos.put("MS06", "性别模糊");
+//        tagSexVos.put("MS07", "性别流动");
+//        tagSexVos.put("MS08", "无性别者");
+//        tagSexVos.put("MS09", "不确定性别");
+//        tagSexVos.put("MS10", "不在乎性别");
+//        return ResponseDto.success(tagSexVos);
+    }
+
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "手机号修改")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "新手机号"),
@@ -88,7 +142,23 @@ public class AdamUserController {
         return ResponseDto.success();
     }
 
-//    @ApiOperationSupport(order = 3)
+    @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<AdamRealInfoVo> identity(@RequestParam String name, @RequestParam String idCard) {
+        // TODO: 2021/5/10
+        log.info("name:{},idCard:{}", name, idCard);
+
+        AdamRealInfoVo infoVo = adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
+
+        return ResponseDto.success(infoVo);
+    }
+
+//    @ApiOperationSupport(order = 6)
 //    @ApiOperation(value = "密码修改")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
@@ -105,7 +175,7 @@ public class AdamUserController {
 //        return ResponseDto.success();
 //    }
 
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "绑定第三方账号")
     @PostMapping(value = {"tpa/bind"})
     public ResponseDto<List<AdamThirdPartInfoVo>> bindTpa(@RequestBody AdamThirdPartParam parameter) {
@@ -124,10 +194,11 @@ public class AdamUserController {
             }
             return ResponseDto.failure("第三方账号已绑定其它手机号");
         }
-        return ResponseDto.success(adamUserService.bindTpa(currentUid, parameter));
+        adamUserService.bindTpa(currentUid, parameter);
+        return ResponseDto.success(adamThirdPartyService.queryByUid(currentUid));
     }
 
-    @ApiOperationSupport(order = 5)
+    @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/AdamAddressesServiceImpl.java

@@ -2,13 +2,11 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.BsonUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
-import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
@@ -58,8 +56,8 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
 
         // TODO: 2021/5/14
         List<Object> objectList = Arrays.asList();
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_addresses.add", objectList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_addresses.add", objectList.toArray()));
 
         redisUtil.hset(AdamRedisConst.INFO_ADDRESSES.concat(adamAddresses.getUid()), adamAddresses.getAddressesId(), adamAddresses);
     }
@@ -135,42 +133,16 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
 //                    SqlMapping.get("adam_enters.update.is_default", paramList.toArray()));
             linkedList.add(paramList.toArray());
 
-            redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
+            redisUtil.hset(AdamRedisConst.INFO_ADDRESSES.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
         }
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_addresses.update.is_default", linkedList));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_addresses.update.is_default", linkedList));
 
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamAddresses info) {
-        AdamAddresses oldAddresses = (AdamAddresses) redisUtil.hget(AdamRedisConst.INFO_ADDRESSES.concat(info.getUid()), info.getAddressesId());
-        if (null == oldAddresses) return;
-        if (info.getIsDefault() && oldAddresses.getIsDefault()) {
-            AdamAddresses unDeaultEnters = new AdamAddresses();
-            unDeaultEnters.setIsDefault(false);
-            unDeaultEnters.setUpdatedAt(info.getUpdatedAt());
-            unDeaultEnters.setUid(info.getUid());
-            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(unDeaultEnters));
-            Document doc = mongoTemplate.getCollection(AdamAddresses.class.getSimpleName()).findOneAndUpdate(
-                    Query.query(Criteria.where("uid").is(unDeaultEnters.getUid()).and("isDefault").is(true)).getQueryObject(),
-                    object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-            );
-
-            if (null != doc) {
-                List<Object> paramList = new ArrayList<>();
-                paramList.add(unDeaultEnters.getIsDefault());
-                paramList.add(unDeaultEnters.getUpdatedAt());
-                paramList.add(doc.get("uid"));
-                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                        SqlMapping.get("adam_addresses.update.is_default", paramList.toArray()));
-
-                AdamAddresses addresses = BsonUtil.toBean(doc, AdamAddresses.class);
-                redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
-            }
-        }
-
         BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(info));
         Document doc = mongoTemplate.getCollection(AdamAddresses.class.getSimpleName()).findOneAndUpdate(
                 Query.query(Criteria.where("addressesId").is(info.getAddressesId())).getQueryObject(),
@@ -179,8 +151,8 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
 
         // TODO: 2021/5/14
         List<Object> paramList = Arrays.asList(null);
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_addresses.edit", paramList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_addresses.edit", paramList.toArray()));
 
         redisUtil.hset(AdamRedisConst.INFO_ADDRESSES.concat(info.getUid()), info.getAddressesId(), BsonUtil.toBean(doc, AdamAddresses.class));
     }
@@ -198,8 +170,8 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
                 .updateOne(Query.query(Criteria.where("addressesId").is(addressesId)).getQueryObject(), object);
 
         List<Object> paramList = Arrays.asList(addresses.getUpdatedAt(), addresses.getDeletedAt(), addressesId);
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_addresses.remove", paramList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_addresses.remove", paramList.toArray()));
 
         redisUtil.hdel(AdamRedisConst.INFO_ADDRESSES.concat(uid), addressesId);
     }

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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
+import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 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 com.liquidnet.service.adam.service.IAdamUserService;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.mongodb.BasicDBObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+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;
+import java.util.List;
+
 /**
  * <p>
  * 收藏 服务实现类
@@ -14,7 +38,117 @@ import org.springframework.stereotype.Service;
  * @author liquidnet
  * @since 2021-05-10
  */
+@Slf4j
 @Service
 public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper, AdamCollection> implements IAdamCollectionService {
+    @Autowired
+    MongoConverter mongoConverter;
+    @Autowired
+    MongoTemplate mongoTemplate;
+    @Autowired
+    RabbitTemplate rabbitTemplate;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    IAdamUserService adamUserService;
+
+
+    /* ---------------- 外部服务API ---------------- */
+    @Autowired
+    FeignKylinPerformanceClient kylinPerformanceClient;
+
+    @Override
+    public void add(AdamCollectBaseVo collectionVo) {
+        LocalDateTime now = LocalDateTime.now();
+        String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
+
+        collectionVo.setState(1);
+        collectionVo.setCreatedAt(nowStr);
+
+        AdamUserInfoVo userInfoVo = adamUserService.queryByUid(collectionVo.getUid());
+        collectionVo.setAvatar(userInfoVo.getAvatar());
+        collectionVo.setNickname(userInfoVo.getNickname());
+        collectionVo.setSex(userInfoVo.getSex());
+
+        mongoTemplate.insert(collectionVo, AdamCollectBaseVo.class.getSimpleName());
+
+        // TODO: 2021/5/19 sql to mq
+
+    }
+
+    @Override
+    public AdamCollectBaseVo 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 mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
+                        .and("contentId").is(contentId).and("state").is(1)),
+                AdamCollectBaseVo.class, AdamCollectBaseVo.class.getSimpleName());
+    }
+
+    @Override
+    public void del(String uid, String type, String contentId) {
+        AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
+        delVo.setState(2);
+        delVo.setUpdatedAt(DateUtil.getNowTime());
+        mongoTemplate.getCollection(AdamCollectBaseVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("uid").is(uid).and("type").is(type)
+                        .and("contentId").is(contentId).and("state").is(1)).getQueryObject(),
+                new BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
+    }
+
+    @Override
+    public boolean queryState(String uid, String type, String contentId) {
+        long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
+                .and("contentId").is(contentId).and("state").is(1)), AdamCollectBaseVo.class.getSimpleName());
+        return count > 0;
+    }
+
+    @Override
+    public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type));
+
+        long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName());
+
+        PageInfo<AdamCollectVo> voPageInfo = null;
+        if (count > 0) {
+            Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
+
+            query.with(pageable);
+
+            List<AdamCollectVo> collectVoList = mongoTemplate.find(query, AdamCollectVo.class, AdamCollectBaseVo.class.getSimpleName());
+
+            try {
+                String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]);
+
+                ResponseDto<List<PerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
+
+                if (performanceVoListDto.isSuccess()) {
+                    List<PerformanceVo> performanceVoList = performanceVoListDto.getData();
+
+                    collectVoList.forEach(v -> {
+                        performanceVoList.forEach(vl -> {
+                            if (vl.getPerformancesId().equals(v.getContentId())) {
+                                v.setContentInfo(vl);
+                            }
+                        });
+                    });
+                } else {
+                    log.info("Failed:{}.API.performanceList(...) for AdamCollection:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
+                }
+            } catch (Exception e) {
+                log.error("Exception:{}.API.performanceList(...) for AdamCollection", kylinPerformanceClient.getClass().getSimpleName(), e);
+            }
+            voPageInfo = PageInfo.of(collectVoList);
+            voPageInfo.setTotal(count);
+        } else {
+            voPageInfo = new PageInfo<>();
+        }
 
+        return voPageInfo;
+    }
 }

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

+package com.liquidnet.service.adam.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.dto.vo.*;
+import com.liquidnet.service.adam.entity.AdamDisposed;
+import com.liquidnet.service.adam.mapper.AdamDisposedMapper;
+import com.liquidnet.service.adam.service.IAdamDisposedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.adam.service.IAdamUserService;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.mongodb.BasicDBObject;
+import io.jsonwebtoken.lang.Collections;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+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;
+import java.util.List;
+
+/**
+ * <p>
+ * 想去 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Slf4j
+@Service
+public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, AdamDisposed> implements IAdamDisposedService {
+    @Autowired
+    MongoConverter mongoConverter;
+    @Autowired
+    MongoTemplate mongoTemplate;
+    @Autowired
+    RabbitTemplate rabbitTemplate;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    IAdamUserService adamUserService;
+
+
+    /* ---------------- 外部服务API ---------------- */
+    @Autowired
+    FeignKylinPerformanceClient kylinPerformanceClient;
+
+    @Override
+    public void add(AdamDisposedBaseVo disposedBaseVo) {
+        LocalDateTime now = LocalDateTime.now();
+        String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
+
+        disposedBaseVo.setState(1);
+        disposedBaseVo.setCreatedAt(nowStr);
+
+        AdamUserInfoVo userInfoVo = adamUserService.queryByUid(disposedBaseVo.getUid());
+        disposedBaseVo.setAvatar(userInfoVo.getAvatar());
+        disposedBaseVo.setNickname(userInfoVo.getNickname());
+        disposedBaseVo.setSex(userInfoVo.getSex());
+
+        mongoTemplate.insert(disposedBaseVo, AdamDisposedBaseVo.class.getSimpleName());
+
+        // TODO: 2021/5/19 sql to mq
+
+    }
+
+    @Override
+    public AdamDisposedBaseVo query(String uid, String type, String contentId) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
+                        .and("contentId").is(contentId).and("state").is(1)),
+                AdamDisposedBaseVo.class, AdamDisposedBaseVo.class.getSimpleName());
+    }
+
+    @Override
+    public void del(String uid, String type, String contentId) {
+        AdamDisposedBaseVo delVo = AdamDisposedBaseVo.getNew();
+        delVo.setState(2);
+        delVo.setUpdatedAt(DateUtil.getNowTime());
+        mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("uid").is(uid).and("type").is(type)
+                        .and("contentId").is(contentId).and("state").is(1)).getQueryObject(),
+                new BasicDBObject("$set", mongoConverter.convertToMongoType(delVo)));
+    }
+
+    @Override
+    public boolean queryState(String uid, String type, String contentId) {
+        long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
+                .and("contentId").is(contentId).and("state").is(1)), AdamDisposedBaseVo.class.getSimpleName());
+        return count > 0;
+    }
+
+    @Override
+    public PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type));
+
+        long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
+
+        PageInfo<AdamDisposedVo> voPageInfo = null;
+        if (count > 0) {
+            Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
+
+            query.with(pageable);
+
+            List<AdamDisposedVo> disposedVoList = mongoTemplate.find(query, AdamDisposedVo.class, AdamDisposedBaseVo.class.getSimpleName());
+
+            if (!Collections.isEmpty(disposedVoList)) {
+                try {
+                    String[] contentIds = disposedVoList.stream().map(AdamDisposedVo::getContentId).toArray(a -> new String[disposedVoList.size()]);
+
+                    ResponseDto<List<PerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
+
+                    if (performanceVoListDto.isSuccess()) {
+                        List<PerformanceVo> performanceVoList = performanceVoListDto.getData();
+
+                        disposedVoList.forEach(v -> {
+                            performanceVoList.forEach(vl -> {
+                                if (vl.getPerformancesId().equals(v.getContentId())) {
+                                    v.setContentInfo(vl);
+                                }
+                            });
+                        });
+                    } else {
+                        log.info("Failed:{}.API.performanceList(...) for AdamDisposedVo:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
+                    }
+                } catch (Exception e) {
+                    log.error("Exception:{}.API.performanceList(...) for AdamDisposedVo", kylinPerformanceClient.getClass().getSimpleName(), e);
+                }
+            }
+
+            voPageInfo = PageInfo.of(disposedVoList);
+            voPageInfo.setTotal(count);
+        } else {
+            voPageInfo = new PageInfo<>();
+        }
+
+        return voPageInfo;
+    }
+}

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

@@ -89,8 +89,8 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
         paramList.add(info.getUpdatedAt());
         paramList.add(info.getDeletedAt());
         paramList.add(info.getComment());
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_enters.add", paramList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_enters.add", paramList.toArray()));
 
         redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(info.getUid()), info.getEntersId(), info);
     }
@@ -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;
     }
 
@@ -155,8 +155,8 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
 
             redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(enters.getUid()), enters.getEntersId(), enters);
         }
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_enters.update.is_default", linkedList));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_enters.update.is_default", linkedList));
     }
 
     @Override
@@ -177,8 +177,8 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
         paramList.add(info.getState());
         paramList.add(info.getUpdatedAt());
         paramList.add(info.getEntersId());
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_enters.edit", paramList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_enters.edit", paramList.toArray()));
 
         redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(info.getUid()), info.getEntersId(), BsonUtil.toBean(doc, AdamEnters.class));
     }
@@ -199,8 +199,8 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
         paramList.add(enters.getUpdatedAt());
         paramList.add(enters.getDeletedAt());
         paramList.add(entersId);
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_enters.remove", paramList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_enters.remove", paramList.toArray()));
 
         redisUtil.hdel(AdamRedisConst.INFO_ENTERS.concat(uid), entersId);
     }

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,16 @@ 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/AdamThirdPartyServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
+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.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamThirdParty;
 import com.liquidnet.service.adam.mapper.AdamThirdPartyMapper;
 import com.liquidnet.service.adam.service.IAdamThirdPartyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -34,9 +34,9 @@ public class AdamThirdPartyServiceImpl extends ServiceImpl<AdamThirdPartyMapper,
     @Override
     public List<AdamThirdPartInfoVo> queryByUid(String uid) {
         List<AdamThirdPartInfoVo> thirdPartInfoVos = (List<AdamThirdPartInfoVo>) redisUtil.hget(AdamRedisConst.INFO_THIRD_PARTY, uid);
-        if (null == thirdPartInfoVos) {
+        if (CollectionUtils.isEmpty(thirdPartInfoVos)) {
             thirdPartInfoVos = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
-                    AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
+                    AdamThirdPartInfoVo.class);
 
             redisUtil.hset(AdamRedisConst.INFO_THIRD_PARTY, uid, thirdPartInfoVos);
         }

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

@@ -56,7 +56,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
         );
 
         List<Object> paramList = Arrays.asList(
-                userInfoVo.getNickName(),
+                userInfoVo.getNickname(),
                 userInfoVo.getSex(),
                 userInfoVo.getBirthday(),
                 userInfoVo.getArea(),
@@ -68,8 +68,8 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 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(isNotComplete ? "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

@@ -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,7 +157,8 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     }
 
     @Override
-    public List<AdamThirdPartInfoVo> bindTpa(String uid, AdamThirdPartParam param) {
+    @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);
 
@@ -164,14 +173,11 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
         redisUtil.hset(AdamRedisConst.INFO_IDENTITY_THIRD_PARTY, param.getPlatform().concat(param.getOpenId()), uid);
 
-        List<AdamThirdPartInfoVo> thirdPartInfoVos = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
-                AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
-        redisUtil.hset(AdamRedisConst.INFO_THIRD_PARTY, uid, thirdPartInfoVos);
-
-        return thirdPartInfoVos;
+        redisUtil.hdel(AdamRedisConst.INFO_THIRD_PARTY, uid);
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public List<AdamThirdPartInfoVo> bindTpaForce(String bindUid, String unBindUid, AdamThirdPartParam param) {
         this.unBindTpaProcess(unBindUid, param.getPlatform());
 
@@ -212,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);
 
@@ -224,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);
@@ -239,8 +247,8 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
                 object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
         List<Object> paramList = Arrays.asList(closeUserInfoVo.getState(), now, now, uid);
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.get("adam_user.close", paramList.toArray()));
+//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//                SqlMapping.get("adam_user.close", paramList.toArray()));
         // TODO: 2021/5/14 Execute sql to mq
 
         redisUtil.hdel(AdamRedisConst.INFO_USER, uid);
@@ -273,4 +281,32 @@ 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 AdamRealInfoVo 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 realInfoVo = AdamRealInfoVo.getNew();
+        realInfoVo.setName(StringUtils.rightPad(StringUtils.left(name, 1), name.length(), "*"));
+        realInfoVo.setIdCard(StringUtils.rightPad(StringUtils.left(idCard, 3), idCard.length(), "*").concat(StringUtils.right(idCard, 2)));
+        realInfoVo.setState(1);
+
+        redisUtil.hset(AdamRedisConst.INFO_REAL_NAME, uid, realInfoVo);
+
+        // TODO: 2021/5/18 修改UserInfoVo，同步redis
+
+
+        return realInfoVo;
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

 10001=验证码发送失败
-10002=
-
+10002=验证码无效
+10003=
+10004=
+10005=手机号获取失败，请更换登录方式
+10006=第三方账号未注册
+10007=
 
 
 10101=

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap/adam_third_party.properties

-adam_third_party.add=insert into ln_adam.adam_third_party (`uid`, open_id, avatar, nick_name, platform, `state`, created_at, updated_at, `comment`) values (?,?,?,?,?,?,?,?,?)
+adam_third_party.add=insert into ln_adam.adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at, updated_at, `comment`) values (?,?,?,?,?,?,?,?,?)
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap/adam_user_info.properties

-adam_user_info.add=insert into adam_user_info (nick_name, sex, birthday, area, signature, avatar, background, qr_code, qr_pic, tag_me, `uid`) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
-adam_user_info.edit=UPDATE ln_adam.adam_user_info SET nick_name=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, qr_code=?, qr_pic=?, tag_me=? WHERE uid=? 
+adam_user_info.add=insert into adam_user_info (nickname, sex, birthday, area, signature, avatar, background, qr_code, qr_pic, tag_me, `uid`) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
+adam_user_info.edit=UPDATE ln_adam.adam_user_info SET nickname=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, qr_code=?, qr_pic=?, tag_me=? WHERE uid=? 
\ No newline at end of file

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

@@ -34,6 +34,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-kylin</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinPerformanceStatusEnum.java

+package com.liquidnet.service.kylin.constant;
+
+/**
+ * 演出状态文案
+ */
+public enum KylinPerformanceStatusEnum {
+    PERFORMANCESTATUS6("购买", 6),
+    PERFORMANCESTATUS7("已下架", 7),
+    PERFORMANCESTATUS8("售馨", 8),
+    PERFORMANCESTATUS9("未开始", 9),
+    PERFORMANCESTATUS10("已结束", 10);
+
+    // 成员变量
+    private String name;
+    private int index;
+
+    private KylinPerformanceStatusEnum(String name, int index) {
+        this.name = name;
+        this.index = index;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public static String getName(int index) {
+        for (KylinPerformanceStatusEnum c : KylinPerformanceStatusEnum.values()) {
+            if (c.getIndex() == index) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -2,17 +2,12 @@ package com.liquidnet.service.kylin.constant;
 
 public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
-
-    public static final String PERFORMANCES = "kylin:performances:id";
+    public static final String PERFORMANCES = "kylin:performances:info";
     public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:";
     public static final String SURPLUS_GENERAL = "surplusGeneral";
     public static final String SURPLUS_EXCHANGE = "surplusExchange";
-
     public static final String TICKET = "kylin:ticket:id";
-
     public static final String TIMES = "kylin:times:id";
-
-    public static final String BANNERS = "kylin:banners:banners";
-    public static final String BANNERSRELATIONS = "kylin:banners:banners_relations";
+    public static final String BANNERS = "kylin:banners";
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersParam.java

@@ -65,9 +65,11 @@ public class BannersParam implements Serializable {
     private List positionList;
 
     @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"1\", \"2\", \"5\"]")
-//    @NotEmpty(message = "请选择推广省份")
     private List provincesList;
 
+    @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京\", \"天津\", \"上海\"]")
+    private List provincesNameList;
+
     @JsonIgnore
     public KylinBanners getFields(String bannersId, String createdAt) {
         KylinBanners fields = new KylinBanners();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersSearchParam.java

@@ -28,8 +28,8 @@ public class BannersSearchParam implements Serializable {
     private Integer promotionType;
 
     @ApiModelProperty(value = "页数 ", example = "1")
-    private int page;
+    private Integer page;
 
     @ApiModelProperty(value = "数量 ", example = "10")
-    private int size;
+    private Integer size;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateTicketTimesParam.java

@@ -32,7 +32,7 @@ public class CreateTicketTimesParam implements Serializable {
 
     @ApiModelProperty(value = "类型 1单日票 2通票", example = "1")
     @NotNull(message = "不能为空")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "", example = "")
     @JsonIgnore

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsAuditParam.java

@@ -22,10 +22,10 @@ public class FieldsAuditParam  implements Serializable {
     private String fieldsId;
 
     @ApiModelProperty(value = "认证状态 1已认证 2被拒绝", example = "1")
-    private int validStatus;
+    private Integer validStatus;
 
     @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝", example = "0",hidden = true)
-    private int changeStatus;
+    private Integer changeStatus;
 
     @ApiModelProperty(value = "拒绝理由", example = "")
     private String refuseMessage;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsParam.java

@@ -55,13 +55,13 @@ public class FieldsParam implements Serializable {
     private String provinceName;
 
     @ApiModelProperty(value = "城市id", example = "1")
-    private int cityId;
+    private Integer cityId;
 
     @ApiModelProperty(value = "城市名称", example = "北京")
     private String cityName;
 
     @ApiModelProperty(value = "县id", example = "1")
-    private int districtId;
+    private Integer districtId;
 
     @ApiModelProperty(value = "县名称", example = "朝阳区")
     private String districtName;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsSearchParam.java

@@ -31,32 +31,32 @@ public class FieldsSearchParam implements Serializable {
     private String districtName;
 
     @ApiModelProperty(value = "认证状态 -1全部 0未认证 1已认证", example = "-1")
-    private int validStatus;
+    private Integer validStatus;
 
     @ApiModelProperty(value = "是否显示 -1全部 0不显示 1显示", example = "-1")
-    private int isDisplay;
+    private Integer isDisplay;
 
     @ApiModelProperty(value = "是否营业 -1全部 0不营业 1营业中", example = "-1")
-    private int isBusiness;
+    private Integer isBusiness;
 
     @ApiModelProperty(value = "审核状态 -1全部 0待审核 1已审核 2被拒绝", example = "-1")
-    private int changeStatus;
+    private Integer changeStatus;
 
     @ApiModelProperty(value = "排序类型 1创建时间 1修改时间 ", example = "1")
-    private int orderType;
+    private Integer orderType;
 
     @ApiModelProperty(value = "页数 ", example = "1")
-    private int page;
+    private Integer page;
 
     @ApiModelProperty(value = "数量 ", example = "10")
-    private int size;
+    private Integer size;
 
     @JsonIgnore
-    private int provinceId;
+    private Integer provinceId;
 
     @JsonIgnore
-    private int cityId;
+    private Integer cityId;
 
     @JsonIgnore
-    private int districtId;
+    private Integer districtId;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsStatusParam.java

@@ -17,10 +17,10 @@ public class FieldsStatusParam implements Serializable {
     private String fieldsId;
 
     @ApiModelProperty(value = "是否显示 0不显示 1显示", example = "1")
-    private int isDisplay;
+    private Integer isDisplay;
 
     @ApiModelProperty(value = "是否营业 0不营业 1营业中", example = "1")
-    private int isBusiness;
+    private Integer isBusiness;
 
     @ApiModelProperty(example = "", hidden = true)
     private String updatedAt;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java

@@ -13,22 +13,22 @@ public class PerformanceAdminListParam {
     private String title;
     @ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
     @NotNull(message = "不能为空")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "城市名称", example = "")
     private String cityName;
     @ApiModelProperty(value = "-2全部,0审核中，2审核拒绝", example = "0")
     @NotNull(message = "不能为空")
-    private int auditStatus;
+    private Integer auditStatus;
     @ApiModelProperty(value = "停售时间（天）-2全部", example = "-2")
     private long stopSellDay;
     @ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00",hidden = true)
     private String stopSellTime;
     @ApiModelProperty(value = "页数", example = "0")
     @NotNull(message = "不能为空")
-    private int page;
+    private Integer page;
     @ApiModelProperty(value = "数量", example = "20")
     @NotNull(message = "不能为空")
-    private int size;
+    private Integer size;
     @ApiModelProperty(value = "排序字段", hidden = true)
     private String orderItem;
     @ApiModelProperty(value = "排序方式", hidden = true)

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceMemberAuditParam.java

@@ -14,13 +14,13 @@ public class PerformanceMemberAuditParam {
     @ApiModelProperty(value = "演出名称")
     private String title;
     @ApiModelProperty(value = "是否会员")
-    private int isMember;
+    private Integer isMember;
     @ApiModelProperty(value = "是否专属")
-    private int isExclusive;
+    private Integer isExclusive;
     @ApiModelProperty(value = "0未提交 1待审核 2已拒绝 3已通过")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "拒绝理由")
-    private int rejectTxt;
+    private String rejectTxt;
     @ApiModelProperty("修改时间")
     private String updatedAt;
     @ApiModelProperty(value = "票种列表")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerListParam.java

@@ -13,33 +13,33 @@ public class PerformancePartnerListParam {
     private String title;
     @ApiModelProperty(value = "-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;", example = "0")
     @NotNull(message = "不能为空")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "-2全部,-1未提交审核，0审核中，1审核通过，2审核拒绝", example = "0")
     @NotNull(message = "不能为空")
-    private int auditStatus;
+    private Integer auditStatus;
     @ApiModelProperty(value = "演出开始时间", example = "2000-01-01 12:00:00")
     private String timeStart;
     @ApiModelProperty(value = "演出结束时间", example = "2000-01-01 12:00:00")
     private String timeEnd;
     @ApiModelProperty(value = "排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序", example = "0")
     @NotNull(message = "不能为空")
-    private int orderType;
+    private Integer orderType;
     @ApiModelProperty(value = "停售时间(单位天 -2全部)", example = "-2")
     private long stopSellDay;
     @ApiModelProperty(value = "停售时间(单位天 -2全部)", example = "-2", hidden = true)
     private String stopSellTime;
     @ApiModelProperty(value = "页数", example = "0")
     @NotNull(message = "不能为空")
-    private int page;
+    private Integer page;
     @ApiModelProperty(value = "数量", example = "20")
     @NotNull(message = "不能为空")
-    private int size;
+    private Integer size;
     @ApiModelProperty(value = "排序字段", hidden = true)
     private String orderItem;
     @ApiModelProperty(value = "排序方式", hidden = true)
     private String orderSc;
 
-    public void setOrderType(int orderType) {
+    public void setOrderType(Integer orderType) {
         this.orderType = orderType;
         switch (orderType) {
             case 1: {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceParam.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerVo.java

@@ -5,10 +5,12 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
-public class PerformanceParam implements Serializable {
+public class PerformancePartnerVo implements Serializable {
 
     @ApiModelProperty(value = "演出id", example = "")
     @JsonIgnore
@@ -21,7 +23,7 @@ public class PerformanceParam implements Serializable {
     private String title;
 
     @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
     private String timeStart;
@@ -60,22 +62,22 @@ public class PerformanceParam implements Serializable {
     private String approvalUrl;
 
     @ApiModelProperty(value = "待支付时间", example = "5")
-    private int payCountdownMinute;
+    private Integer payCountdownMinute;
 
     @ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
     private String noticeImage;
 
     @ApiModelProperty(value = "是否实名", example = "0")
-    private int isTrueName;
+    private Integer isTrueName;
 
     @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
-    private int limitCount;
+    private Integer limitCount;
 
     @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
-    private int isSubmit;
+    private Integer isSubmit;
 
     @ApiModelProperty(value = "状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "0")
-    private int status;
+    private Integer status;
 
     @ApiModelProperty(value = "第三方id", example = "0")
     private String merchantId;
@@ -84,14 +86,26 @@ public class PerformanceParam implements Serializable {
     private String describes;
 
     @ApiModelProperty(value = "是否售卖", example = "0")
-    private int statusSell;
+    private Integer statusSell;
 
     @ApiModelProperty(value = "巡演id", example = "0",hidden = true)
     private String roadShowId;
 
+    @ApiModelProperty(value = "拒绝理由",hidden = true)
+    private String rejectTxt;
+
+    @ApiModelProperty(value = "审核状态", hidden = true)
+    private Integer auditStatus;
+
+    @ApiModelProperty(value = "审核状态", hidden = true)
+    private Integer isShow;
+
     @ApiModelProperty(value = "搭售id", example = "0",hidden = true)
     private String projectId;
 
+    @ApiModelProperty(value = "购票须知 Id 数组")
+    private List<String> noticeIds;
+
     @ApiModelProperty(value = "", example = "")
     private String createdAt;
 
@@ -99,5 +113,5 @@ public class PerformanceParam implements Serializable {
     private String updatedAt;
 
     @ApiModelProperty(value = "是否保存", example = "")
-    private int isCreateSave;
+    private Integer isCreateSave;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceRecommendAdminParam.java

@@ -11,5 +11,5 @@ public class PerformanceRecommendAdminParam {
     @ApiModelProperty(value = "演出id")
     private String performanceId;
     @ApiModelProperty(value = "推荐位")
-    private int isRecommend;
+    private Integer isRecommend;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep1Param.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class PerformanceStep1Param implements Serializable {
@@ -18,6 +19,7 @@ public class PerformanceStep1Param implements Serializable {
     private String imgPoster;
 
     @ApiModelProperty(value = "第三方id", example = "0")
+    @NotNull(message = "不能为空")
     private String merchantId;
 
     @ApiModelProperty(value = "演出名称", example = "测试演出")
@@ -26,7 +28,7 @@ public class PerformanceStep1Param implements Serializable {
 
     @ApiModelProperty(value = "1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演", example = "3")
     @NotNull(message = "不能为空")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
     @NotNull(message = "不能为空")
@@ -74,12 +76,15 @@ public class PerformanceStep1Param implements Serializable {
 
     @ApiModelProperty(value = "待支付时间", example = "5")
     @NotNull(message = "不能为空")
-    private int payCountdownMinute;
+    private Integer payCountdownMinute;
 
-    @ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
-    @NotNull(message = "不能为空")
+    @ApiModelProperty(value = "购票须知",hidden = true,example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
     private String noticeImage;
 
+    @ApiModelProperty(value = "购票须知 Id 数组")
+    @NotNull(message = "不能为空")
+    private List<String> noticeIds;
+
     @ApiModelProperty(value = "演出简介", example = "")
     private String describes;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java

@@ -18,15 +18,15 @@ public class PerformanceStep2Param implements Serializable {
 
     @ApiModelProperty(value = "是否实名", example = "0")
     @NotNull(message = "不能为空")
-    private int isTrueName;
+    private Integer isTrueName;
 
     @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
     @NotNull(message = "不能为空")
-    private int limitCount;
+    private Integer limitCount;
 
     @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
     @NotNull(message = "不能为空")
-    private int isSubmit;
+    private Integer isSubmit;
 
     @ApiModelProperty(value = "场次数据",hidden = true)
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java

@@ -35,15 +35,15 @@ public class TicketCreateParam implements Serializable {
 
     @ApiModelProperty(value = "是否学生票 0否 1是", example = "0")
     @NotNull(message = "不能为空")
-    private int isStudent;
+    private Integer isStudent;
 
     @ApiModelProperty(value = "是否电子票", example = "0")
     @NotNull(message = "不能为空")
-    private int isElectronic;
+    private Integer isElectronic;
 
     @ApiModelProperty(value = "是否快递票", example = "0")
     @NotNull(message = "不能为空")
-    private int isExpress;
+    private Integer isExpress;
 
     @ApiModelProperty(value = "价格", example = "100.00")
     @NotNull(message = "不能为空")
@@ -54,15 +54,15 @@ public class TicketCreateParam implements Serializable {
 
     @ApiModelProperty(value = "总库存", example = "100")
     @NotNull(message = "不能为空")
-    private int totalGeneral;
+    private Integer totalGeneral;
 
     @ApiModelProperty(value = "总兑换库存", example = "100")
     @NotNull(message = "不能为空")
-    private int totalExchange;
+    private Integer totalExchange;
 
     @ApiModelProperty(value = "限购数量", example = "0")
     @NotNull(message = "不能为空")
-    private int limitCount;
+    private Integer limitCount;
 
     @ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
     @NotNull(message = "不能为空")
@@ -76,18 +76,18 @@ public class TicketCreateParam implements Serializable {
     private String describes;
 
     @ApiModelProperty(value = "是否展示二维码 0否 1是", example = "0")
-    private int isShowCode;
+    private Integer isShowCode;
 
     @ApiModelProperty(value = "二维码显示时间", example = "2020-12-01T14:00:00")
     private LocalDateTime qrCodeShowTime;
 
     @ApiModelProperty(value = "次数", example = "1")
     @NotNull(message = "不能为空")
-    private int counts;
+    private Integer counts;
 
     @ApiModelProperty(value = "是否开启缺票登记", example = "1")
     @NotNull(message = "不能为空")
-    private int isLackRegister;
+    private Integer isLackRegister;
 
     @ApiModelProperty(value = "", hidden = true)
     private String createdAt;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketMemberAuditParam.java

@@ -16,7 +16,7 @@ public class TicketMemberAuditParam {
     @ApiModelProperty(value = "会员优惠价格")
     private BigDecimal priceDiscountMember;
     @ApiModelProperty(value = "会员优惠时间段限购数量")
-    private int memberLimitCount;
+    private Integer memberLimitCount;
     @ApiModelProperty(value = "会员提前开售分钟")
-    private int advanceMinuteMember;
+    private Integer advanceMinuteMember;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BannersVo.java

@@ -60,6 +60,9 @@ public class BannersVo implements Serializable {
     @ApiModelProperty(value = "推广省份 多选 数组")
     private List provincesList;
 
+    @ApiModelProperty(value = "城市名称")
+    private List provincesNameList;
+
     @ApiModelProperty(value = "是否删除 0已删除,1正常")
     private Integer isDeleted;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BuyNoticeVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import lombok.Data;
+
+@Data
+public class BuyNoticeVo {
+
+    private String buyNoticeId;
+
+    private String title;
+
+    private String imgUrl;
+
+    private String message;
+
+    private Integer sort;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsMisDetailsVo.java

@@ -62,16 +62,16 @@ public class FieldsMisDetailsVo implements Serializable {
     private String districtName;
 
     @ApiModelProperty(value = "认证状态 0未认证 1已认证")
-    private int validStatus;
+    private Integer validStatus;
 
     @ApiModelProperty(value = "是否显示 0不显示 1显示")
-    private int isDisplay;
+    private Integer isDisplay;
 
     @ApiModelProperty(value = "是否营业 0不营业 1营业中")
-    private int isBusiness;
+    private Integer isBusiness;
 
     @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
-    private int changeStatus;
+    private Integer changeStatus;
 
     @ApiModelProperty(value = "创建时间")
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsMisListVo.java

@@ -39,16 +39,16 @@ public class FieldsMisListVo implements Serializable {
     private String districtName;
 
     @ApiModelProperty(value = "认证状态 0未认证 1已认证")
-    private int validStatus;
+    private Integer validStatus;
 
     @ApiModelProperty(value = "是否显示 0不显示 1显示")
-    private int isDisplay;
+    private Integer isDisplay;
 
     @ApiModelProperty(value = "是否营业 0不营业 1营业中")
-    private int isBusiness;
+    private Integer isBusiness;
 
     @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
-    private int changeStatus;
+    private Integer changeStatus;
 
     @ApiModelProperty(value = "创建时间")
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsVo.java

@@ -48,19 +48,19 @@ public class FieldsVo implements Serializable {
     private String description;
 
     @ApiModelProperty(value = "省id")
-    private int provinceId;
+    private Integer provinceId;
 
     @ApiModelProperty(value = "省名称")
     private String provinceName;
 
     @ApiModelProperty(value = "城市id")
-    private int cityId;
+    private Integer cityId;
 
     @ApiModelProperty(value = "城市名称")
     private String cityName;
 
     @ApiModelProperty(value = "县id")
-    private int districtId;
+    private Integer districtId;
 
     @ApiModelProperty(value = "县名称")
     private String districtName;
@@ -69,16 +69,16 @@ public class FieldsVo implements Serializable {
     private String refuseMessage;
 
     @ApiModelProperty(value = "认证状态 0未认证 1已认证")
-    private int validStatus;
+    private Integer validStatus;
 
     @ApiModelProperty(value = "是否显示 0不显示 1显示")
-    private int isDisplay;
+    private Integer isDisplay;
 
     @ApiModelProperty(value = "是否营业 0不营业 1营业中")
-    private int isBusiness;
+    private Integer isBusiness;
 
     @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
-    private int changeStatus;
+    private Integer changeStatus;
 
     @ApiModelProperty(value = "补充字段")
     private String comment;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
+import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
@@ -35,47 +36,53 @@ public class PerformanceVo {
     @ApiModelProperty(value = "开售时间")
     private String sellTime;
     @ApiModelProperty(value = "城市id")
-    private String cityId;
+    private Integer cityId;
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
     @ApiModelProperty(value = "场地id")
     private String fieldId;
     @ApiModelProperty(value = "场地名称")
     private String fieldName;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+    @ApiModelProperty(value = "场地距离当前位置距离")
+    private String diffDistance;
     @ApiModelProperty(value = "搭售id")
     private String projectId;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
 
-//@ApiModelProperty(value = "巡演相关")
-//    private String roadShowId;
     // OSS
 //    @ApiModelProperty(value = "演出详情")
 //    private String details;
     // OSS
-//    @ApiModelProperty(value = "购票须知")
-//    private String noticeImage;
+    @ApiModelProperty(value = "购票须知")
+    private String noticeImage;
 
     @ApiModelProperty(value = "推荐顺序 0为不推荐")
-    private int isRecommend;
+    private Integer isRecommend;
     @ApiModelProperty(value = "状态")
-    private int appStatus;
+    private Integer appStatus;
     @ApiModelProperty(value = "是否可买")
-    private int statusSell;
+    private Integer statusSell;
     @ApiModelProperty(value = "是否关联会员")
-    private int isMember;
+    private Integer isMember;
     @ApiModelProperty(value = "是否开启缺票登记")
-    private int isLackRegister;
+    private Integer isLackRegister;
     @ApiModelProperty(value = "是否实名")
-    private int isTrueName;
+    private Integer isTrueName;
     @ApiModelProperty(value = "限购张数")
-    private int limitCount;
+    private Integer limitCount;
     @ApiModelProperty(value = "会员限购张数")
     private Integer limitCountMember;
     @ApiModelProperty(value = "是否专属")
-    private int isExclusive;
+    private Integer isExclusive;
     @ApiModelProperty(value = "是否优惠")
-    private int isDiscount;
+    private Integer isDiscount;
     @ApiModelProperty(value = "是否提前")
-    private int isAdvance;
+    private Integer isAdvance;
     @ApiModelProperty(value = "文案")
     private String message;
 
@@ -102,6 +109,14 @@ public class PerformanceVo {
         this.message = "";
     }
 
+    public void setFieldsData(KylinFields fields,String cityName){
+        this.longitude = fields.getLongitude();
+        this.latitude = fields.getLatitude();
+        this.cityName = cityName;
+        this.fieldName = fields.getName();
+        this.cityId = fields.getCityId();
+    }
+
     public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {
         this.statusSell = performanceStatus.getStatusSell();
         this.isRecommend = performanceStatus.getIsRecommend();
@@ -113,8 +128,6 @@ public class PerformanceVo {
     //TODO 巡演 搭售 场地
     public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
         this.fieldId = performanceRelations.getFieldId();
-        this.fieldName = "";
-        this.cityId = "";
         this.projectId = performanceRelations.getProjectId();
         this.roadShowId = performanceRelations.getRoadShowId();
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketTimesVo.java

@@ -17,7 +17,7 @@ public class TicketTimesVo {
     @ApiModelProperty(value = "名称")
     private String title;
     @ApiModelProperty(value = "类型 1单日 2通票")
-    private int type;
+    private Integer type;
     @ApiModelProperty(value = "演出id")
     private String  performanceId;
     @ApiModelProperty(value = "场次id")
@@ -26,6 +26,8 @@ public class TicketTimesVo {
     private String useStart;
     @ApiModelProperty(value = "适用结束时间")
     private String useEnd;
+    @ApiModelProperty(value = "票种")
+    private List<TicketVo> ticketList;
 
 //    @ApiModelProperty(value = "票种信息集合")
 //    private List<TicketVo> ticketVoList;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketVo.java

@@ -21,7 +21,7 @@ public class TicketVo {
     @ApiModelProperty(value = "名称")
     private String title;
     @ApiModelProperty(value = "类型 1单日 2通票")
-    private int type;
+    private Integer type;
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
     @ApiModelProperty(value = "快递费")
@@ -49,33 +49,33 @@ public class TicketVo {
     @ApiModelProperty(value = "适用结束时间")
     private String useEnd;
     @ApiModelProperty(value = "开票倒计时(分钟数)")
-    private int saleRemindMinute;
+    private Integer saleRemindMinute;
     @ApiModelProperty(value = "是否学生票")
-    private int isStudent;
+    private Integer isStudent;
     @ApiModelProperty(value = "是否电子票")
-    private int isElectronic;
+    private Integer isElectronic;
     @ApiModelProperty(value = "是否快递票")
-    private int isExpress;
+    private Integer isExpress;
     @ApiModelProperty(value = "可验证次数")
     private Integer counts;
     @ApiModelProperty(value = "状态")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "兑换状态")
-    private int statusExchange;
+    private Integer statusExchange;
     @ApiModelProperty(value = "是否缺票登记")
-    private int isLackRegister;
+    private Integer isLackRegister;
     @ApiModelProperty(value = "快递状态 1寄付 2到付")
-    private int expressType;
+    private Integer expressType;
     @ApiModelProperty(value = "是否实名")
-    private int isTrueName;
+    private Integer isTrueName;
     @ApiModelProperty(value = "限购张数")
-    private int limitCount;
+    private Integer limitCount;
     @ApiModelProperty(value = "会员限购张数")
     private Integer limitCountMember;
     @ApiModelProperty(value = "是否会员专属")
-    private int isExclusive;
+    private Integer isExclusive;
     @ApiModelProperty(value = "是否会员")
-    private int isMember;
+    private Integer isMember;
 
     public void setTicket(KylinTickets ticket) {
         this.ticketsId = ticket.getTicketsId();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/PerformanceMemberHistoryVo.java

@@ -9,9 +9,9 @@ import lombok.Data;
 public class PerformanceMemberHistoryVo {
 
     @ApiModelProperty(value = "0未提交 1待审核 2已拒绝 3已通过")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "审核时间")
     private String auditTime;
     @ApiModelProperty(value = "拒绝理由")
-    private int rejectTxt;
+    private String rejectTxt;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/RoadShowAdminVo.java

@@ -13,5 +13,5 @@ public class RoadShowAdminVo {
     @ApiModelProperty(value = "标题")
     private String title;
     @ApiModelProperty(value = "状态")
-    private int status;
+    private Integer status;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/PerformanceIgnoreVo.java

@@ -17,8 +17,10 @@ public class PerformanceIgnoreVo {
     private String performancesId;
     @ApiModelProperty(value = "演出名称")
     private String title;
+    @ApiModelProperty(value = "演出图片")
+    private String imgPoster;
     @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
-    private int type;
+    private Integer type;
     @ApiModelProperty(value = "演出开始时间")
     private String timeStart;
     @ApiModelProperty(value = "演出结束时间")
@@ -29,20 +31,23 @@ public class PerformanceIgnoreVo {
     private String price;
     @ApiModelProperty(value = "开售时间")
     private String sellTime;
-
     @ApiModelProperty(value = "城市id")
-    private String cityId;
+    private Integer cityId;
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
     @ApiModelProperty(value = "场地id")
     private String fieldId;
     @ApiModelProperty(value = "场地名称")
     private String fieldName;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
     @ApiModelProperty(value = "搭售id")
     private String projectId;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
 
-//@ApiModelProperty(value = "巡演相关")
-//    private String roadShow;
     // OSS
 //    @ApiModelProperty(value = "演出详情")
 //    private String details;
@@ -50,50 +55,29 @@ public class PerformanceIgnoreVo {
 //    @ApiModelProperty(value = "购票须知")
 //    private String noticeImage;
 
+    @ApiModelProperty(value = "推荐顺序 0为不推荐")
+    private Integer isRecommend;
     @ApiModelProperty(value = "状态")
-    private int appStatus;
+    private Integer appStatus;
     @ApiModelProperty(value = "是否可买")
-    private int statusSell;
+    private Integer statusSell;
     @ApiModelProperty(value = "是否关联会员")
-    private int isMember;
+    private Integer isMember;
     @ApiModelProperty(value = "是否开启缺票登记")
-    private int isLackRegister;
+    private Integer isLackRegister;
+    @ApiModelProperty(value = "是否实名")
+    private Integer isTrueName;
+    @ApiModelProperty(value = "限购张数")
+    private Integer limitCount;
+    @ApiModelProperty(value = "会员限购张数")
+    private Integer limitCountMember;
     @ApiModelProperty(value = "是否专属")
-    private int isExclusive;
+    private Integer isExclusive;
+    @ApiModelProperty(value = "是否优惠")
+    private Integer isDiscount;
+    @ApiModelProperty(value = "是否提前")
+    private Integer isAdvance;
     @ApiModelProperty(value = "文案")
     private String message;
 
-
-    public void setPerformance(KylinPerformances performance) {
-        this.performancesId = performance.getPerformancesId();
-        this.title = performance.getTitle();
-        this.timeStart = performance.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.timeEnd = performance.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-    }
-
-    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime) {
-        this.isLackRegister = isLackRegister;
-        this.isMember = isMember;
-        this.isExclusive = isExclusive;
-        this.price = price + "起";
-        this.stopSellTime = stopSellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.sellTime = sellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.appStatus = 9;
-        this.message = "";
-
-
-    }
-
-    public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {
-        this.statusSell = performanceStatus.getStatusSell();
-    }
-
-    //TODO 巡演 搭售 场地
-    public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
-        this.fieldId = "";
-        this.fieldName = "";
-        this.cityId = "";
-        this.projectId = "";
-        this.roadShowId = "";
-    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/TicketIgnoreVo.java

@@ -18,7 +18,7 @@ public class TicketIgnoreVo {
     @ApiModelProperty(value = "名称")
     private String title;
     @ApiModelProperty(value = "类型 1单日 2通票")
-    private int type;
+    private Integer type;
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
     @ApiModelProperty(value = "快递费")
@@ -46,29 +46,29 @@ public class TicketIgnoreVo {
     @ApiModelProperty(value = "适用结束时间")
     private String useEnd;
     @ApiModelProperty(value = "开票倒计时(分钟数)")
-    private int saleRemindMinute;
+    private Integer saleRemindMinute;
     @ApiModelProperty(value = "是否学生票")
-    private int isStudent;
+    private Integer isStudent;
     @ApiModelProperty(value = "是否电子票")
-    private int isElectronic;
+    private Integer isElectronic;
     @ApiModelProperty(value = "是否快递票")
-    private int isExpress;
+    private Integer isExpress;
     @ApiModelProperty(value = "状态")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "兑换状态")
-    private int statusExchange;
+    private Integer statusExchange;
     @ApiModelProperty(value = "是否缺票登记")
-    private int isLackRegister;
+    private Integer isLackRegister;
     @ApiModelProperty(value = "快递状态 1寄付 2到付")
-    private int expressType;
+    private Integer expressType;
     @ApiModelProperty(value = "是否实名")
-    private int isTrueName;
+    private Integer isTrueName;
     @ApiModelProperty(value = "限购张数")
-    private int limitCount;
+    private Integer limitCount;
     @ApiModelProperty(value = "是否会员专属")
-    private int isExclusive;
+    private Integer isExclusive;
     @ApiModelProperty(value = "是否会员")
-    private int isMember;
+    private Integer isMember;
 
     public void setTicket(KylinTickets ticket) {
         this.ticketsId = ticket.getTicketsId();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/TicketTimesIgnoreVo.java

@@ -14,7 +14,7 @@ public class TicketTimesIgnoreVo {
     @ApiModelProperty(value = "名称")
     private String title;
     @ApiModelProperty(value = "类型 1单日 2通票")
-    private int type;
+    private Integer type;
     @ApiModelProperty(value = "演出id")
     private String  performanceId;
     @ApiModelProperty(value = "场次id")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceMisVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo.partner;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
@@ -25,7 +26,7 @@ public class PerformanceMisVo {
     private String imgPoster;
 
     @ApiModelProperty(value = "类型")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "场地id")
     private String fieldId;
@@ -58,31 +59,31 @@ public class PerformanceMisVo {
     private String noticeImage;
 
     @ApiModelProperty(value = "状态")
-    private int status;
+    private Integer status;
 
     @ApiModelProperty(value = "拒绝理由")
     private String rejectTxt;
 
     @ApiModelProperty(value = "是否展示")
-    private int isShow;
+    private Integer isShow;
 
     @ApiModelProperty(value = "是否销售")
-    private int statusSell;
+    private Integer statusSell;
 
     @ApiModelProperty(value = "是否分销")
-    private int isDistribution;
+    private Integer isDistribution;
 
     @ApiModelProperty(value = "是否同步小家伙")
-    private int syncAgent;
+    private Integer syncAgent;
 
     @ApiModelProperty(value = "-1未提交审核，0提交审核，1审核通过，2审核拒绝")
-    private int auditStatus;
+    private Integer auditStatus;
 
     @ApiModelProperty(value = "是否实名")
-    private int isTrueName;
+    private Integer isTrueName;
 
     @ApiModelProperty(value = "限购数量")
-    private int limitCount;
+    private Integer limitCount;
 
     @ApiModelProperty(value = "限购数量")
     private String createdAt;
@@ -91,7 +92,7 @@ public class PerformanceMisVo {
     private String updatedAt;
 
     @ApiModelProperty(value = "权重")
-    private int sort;
+    private Integer sort;
 
     @ApiModelProperty(value = "权重")
     private String describes;
@@ -106,7 +107,7 @@ public class PerformanceMisVo {
     private String notice;
 
     @ApiModelProperty(value = "订单可支付时间")
-    private int payCountdownMinute;
+    private Integer payCountdownMinute;
 
     @ApiModelProperty(value = "第三方id")
     private String merchantId;
@@ -117,6 +118,9 @@ public class PerformanceMisVo {
     @ApiModelProperty(value = "搭售id")
     private String projectId;
 
+    @ApiModelProperty(value = "购票须知 Id 数组")
+    private List<String> noticeIds;
+
     //场次数据
     @ApiModelProperty(value = "场次数据")
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerListVo.java

 package com.liquidnet.service.kylin.dto.vo.partner;
 
-import com.liquidnet.service.kylin.dto.param.PerformanceParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -17,24 +17,24 @@ public class PerformancePartnerListVo {
     @ApiModelProperty(value = "结束时间")
     private String timeEnd;
     @ApiModelProperty(value = "总库存")
-    private int totalGeneral;
+    private Integer totalGeneral;
     @ApiModelProperty(value = "销售库存")
-    private int saleGeneral;
+    private Integer saleGeneral;
     @ApiModelProperty(value = "总销售金额")
-    private int totalSalePrice;
+    private Integer totalSalePrice;
     @ApiModelProperty(value = "剩余库存")
-    private int surplusGeneral;
+    private Integer surplusGeneral;
     @ApiModelProperty(value = "演出状态")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
-    private int auditStatus;
+    private Integer auditStatus;
     @ApiModelProperty(value = "拒绝理由")
     private String rejectTxt;
     @ApiModelProperty(value = "创建时间")
     private String createdAt;
 
     @ApiModelProperty(value = "返回数据赋值",hidden = true)
-    public void setStatus0Data(PerformanceParam item){
+    public void setStatus0Data(PerformancePartnerVo item){
         this.performancesId=item.getPerformancesId();
         this.title=item.getTitle();
         this.timeStart=item.getTimeStart();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerVo.java

-package com.liquidnet.service.kylin.dto.vo.partner;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class PerformancePartnerVo implements Serializable {
-
-    @ApiModelProperty(value = "演出id", example = "")
-    @JsonIgnore
-    private String performancesId;
-
-    @ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
-    private String imgPoster;
-
-    @ApiModelProperty(value = "演出名称", example = "测试演出")
-    private String title;
-
-    @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
-    private int type;
-
-    @ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
-    private String timeStart;
-
-    @ApiModelProperty(value = "演出结束时间", example = "2021-05-04 12:00:00")
-    private String timeEnd;
-
-    @ApiModelProperty(value = "场地id", example = "1")
-    private String fieldId;
-
-    @ApiModelProperty(value = "场地id", example = "1")
-    private String fieldName;
-
-    @ApiModelProperty(value = "演出公告", example = "这是演出公告")
-    private String notice;
-
-    @ApiModelProperty(value = "主办方id", example = "1")
-    private String sponsorId;
-
-    @ApiModelProperty(value = "主办方类型", example = "1")
-    private String sponsorType;
-
-    @ApiModelProperty(value = "主办方名称", example = "主办方名称")
-    private String sponsor;
-
-    @ApiModelProperty(value = "联系人", example = "联系人")
-    private String contacts;
-
-    @ApiModelProperty(value = "联系方式", example = "手机号")
-    private String mobile;
-
-    @ApiModelProperty(value = "演出详情", example = "<p>演出详情</p>")
-    private String details;
-
-    @ApiModelProperty(value = "演出批文地址", example = "这是一个演出批文地址")
-    private String approvalUrl;
-
-    @ApiModelProperty(value = "待支付时间", example = "5")
-    private int payCountdownMinute;
-
-    @ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
-    private String noticeImage;
-
-    @ApiModelProperty(value = "是否实名", example = "0")
-    private int isTrueName;
-
-    @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
-    private int limitCount;
-
-    @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
-    private int isSubmit;
-
-    @ApiModelProperty(value = "状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "0")
-    private int status;
-
-    @ApiModelProperty(value = "第三方id", example = "0")
-    private String merchantId;
-
-    @ApiModelProperty(value = "演出简介", example = "0")
-    private String describes;
-
-    @ApiModelProperty(value = "是否售卖", example = "0")
-    private int statusSell;
-
-    @ApiModelProperty(value = "巡演id", example = "0",hidden = true)
-    private String roadShowId;
-
-    @ApiModelProperty(value = "搭售id", example = "0",hidden = true)
-    private String projectId;
-
-    @ApiModelProperty(value = "", example = "")
-    private String createdAt;
-
-    @ApiModelProperty(value = "是否保存", example = "")
-    private int isCreateSave;
-}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketPartnerVo.java

@@ -20,16 +20,16 @@ public class TicketPartnerVo implements Serializable {
     private String title;
 
     @ApiModelProperty(value = "是否学生票 0否 1是", example = "0", hidden = true)
-    private int isStudent;
+    private Integer isStudent;
 
     @ApiModelProperty(value = "是否电子票", example = "0")
-    private int isElectronic;
+    private Integer isElectronic;
 
     @ApiModelProperty(value = "是否快递票", example = "0")
-    private int isExpress;
+    private Integer isExpress;
 
     @ApiModelProperty(value = "类型", example = "2")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "价格", example = "100.00")
     private BigDecimal price;
@@ -38,16 +38,16 @@ public class TicketPartnerVo implements Serializable {
     private String timeEndExpress;
 
     @ApiModelProperty(value = "总库存", example = "100")
-    private int totalGeneral;
+    private Integer totalGeneral;
 
     @ApiModelProperty(value = "总兑换库存", example = "100")
-    private int totalExchange;
+    private Integer totalExchange;
 
     @ApiModelProperty(value = "限购数量", example = "0")
-    private int limitCount;
+    private Integer limitCount;
 
     @ApiModelProperty(value = "次数", example = "0")
-    private int counts;
+    private Integer counts;
 
     @ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
     private String timeStart;
@@ -68,7 +68,7 @@ public class TicketPartnerVo implements Serializable {
     private Integer status;
 
     @ApiModelProperty(value = "是否展示二维码 0否 1是", example = "0")
-    private int isShowCode;
+    private Integer isShowCode;
 
     @ApiModelProperty(value = "二维码显示时间", example = "2020-12-01T14:00:00")
     private String qrCodeShowTime;
@@ -77,25 +77,25 @@ public class TicketPartnerVo implements Serializable {
     private String timesId;
 
     @ApiModelProperty(value = "是否开启缺票登记")
-    private int isLackRegister;
+    private Integer isLackRegister;
 
     @ApiModelProperty(value = "剩余库存", example = "100")
-    private int surplusGeneral;
+    private Integer surplusGeneral;
 
     @ApiModelProperty(value = "剩余兑换库存", example = "100")
-    private int surplusExchange;
+    private Integer surplusExchange;
 
     @ApiModelProperty(value = "快递类型 1寄付 2到付", example = "100")
-    private int expressType;
+    private Integer expressType;
 
     @ApiModelProperty(value = "是否开启转赠", example = "100")
-    private int isTransfer;
+    private Integer isTransfer;
 
     @ApiModelProperty(value = "是否 会员", example = "100")
-    private int isMember;
+    private Integer isMember;
 
     @ApiModelProperty(value = "是否专属", example = "100")
-    private int isExclusive;
+    private Integer isExclusive;
 
     @ApiModelProperty(value = "")
     private String createdAt;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesPartnerVo.java

@@ -28,10 +28,10 @@ public class TicketTimesPartnerVo implements Serializable {
     private Integer status;
 
     @ApiModelProperty(value = "状态 1单日票 2通票")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "是否开启缺票登记")
-    private int isLackRegister;
+    private Integer isLackRegister;
 
 
     @ApiModelProperty(value = "创建时间")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesTicketCreatePartnerVo.java

@@ -26,10 +26,10 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
     private String useEnd;
 
     @ApiModelProperty(value = "状态 0不可见 1可见")
-    private int status;
+    private Integer status;
 
     @ApiModelProperty(value = "状态 1单日票 2通票")
-    private int type;
+    private Integer type;
 
     @ApiModelProperty(value = "创建时间")
     private String createdAt;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinBuyNoticePartnerService.java

+package com.liquidnet.service.kylin.service.partner;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 购票须知表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+public interface IKylinBuyNoticePartnerService extends IService<KylinBuyNotice> {
+
+    /**
+     * 购票须知列表
+     * @return 分页 mysql 数据
+     */
+    PageInfo<BuyNoticeVo> getBuyNotice();
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java

@@ -2,9 +2,9 @@ package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 /**
@@ -20,12 +20,15 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     /**
      * 演出第一步
+     *
      * @param step1Param 相关参数
      * @return 演出id
      */
     String step1(PerformanceStep1Param step1Param);
+
     /**
      * 创建演出第一步
+     *
      * @param step1Param 相关参数
      * @return 演出id
      */
@@ -33,6 +36,7 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     /**
      * 修改演出第一步
+     *
      * @param step1Param 相关参数
      * @return 演出id
      */
@@ -40,74 +44,63 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     /**
      * 获取演出第一步数据
+     *
      * @param performancesId 演出id
      * @return 演出对象
      */
-    PerformancePartnerVo getStep1(String performancesId);
-
-//    /**
-//     * 获取创建演出第一步数据
-//     * @param performancesId
-//     * @return
-//     */
-//    PerformanceParam getCreateStep1(String performancesId);
-//
-//    /**
-//     * 获取修改演出第一步数据
-//     * @param performancesId
-//     * @return
-//     */
-//    PerformanceParam getUpdateStep1(String performancesId);
-
+    ResponseDto<PerformancePartnerVo> getStep1(String performancesId);
 
     /**
      * 演出第二步
+     *
      * @param step2Param 相关参数
-     * @return boolean
+     * @return String
      */
-    boolean step2(PerformanceStep2Param step2Param);
+    ResponseDto<String> step2(PerformanceStep2Param step2Param);
 
     /**
      * 演出第二步创建
+     *
      * @param step2Param 相关参数
-     * @return boolean
+     * @return String
      */
-    boolean createStep2(PerformanceStep2Param step2Param);
+    ResponseDto<String> createStep2(PerformanceStep2Param step2Param);
 
     /**
      * 演出第二步修改
+     *
      * @param step2Param 相关参数
-     * @return boolean
+     * @return String
      */
-    boolean updateStep2(PerformanceStep2Param step2Param);
+    ResponseDto<String> updateStep2(PerformanceStep2Param step2Param);
 
     /**
      * 获取演出第二步数据
+     *
      * @param performancesId 演出id
      * @return 演出 第二步 数据
      */
-    PerformanceStep2Param getStep2(String performancesId);
-
-//    PerformanceStep2Param getCreateStep2(String performancesId);
-//
-//    PerformanceStep2Param getUpdateStep2(String performancesId);
+    ResponseDto<PerformanceStep2Param> getStep2(String performancesId);
 
     /**
      * 演出上线
+     *
      * @param performancesId 演出id
-     * @return boolean
+     * @return String
      */
-    boolean onLinePerformance(String performancesId);
+    ResponseDto<String> onLinePerformance(String performancesId);
 
     /**
      * 演出下线
+     *
      * @param performancesId 演出id
-     * @return boolean
+     * @return String
      */
-    boolean outLinePerformance(String performancesId);
+    ResponseDto<String> outLinePerformance(String performancesId);
 
     /**
      * 复制演出 (只有巡演类型)
+     *
      * @param performancesId 演出id
      * @return 演出id
      */
@@ -115,8 +108,18 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     /**
      * 演出列表
+     *
      * @param performancePartnerListParam 相关参数
      * @return 分页 msql 数据
      */
-    PageInfo<PerformancePartnerListDao> getList(PerformancePartnerListParam performancePartnerListParam);
+    ResponseDto<PageInfo<PerformancePartnerListDao>> getList(PerformancePartnerListParam performancePartnerListParam);
+
+
+    /**
+     * 演出撤回
+     *
+     * @param performancesId 演出id
+     * @return String
+     */
+    ResponseDto<String> withdraw(String performancesId);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketTimesPartnerService.java

 package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
@@ -23,35 +24,35 @@ public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTim
      * @param createTicketTimesParam 相关参数
      * @return vo
      */
-    TicketTimesPartnerVo createTimesSummary(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<TicketTimesPartnerVo> createTimesSummary(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 未通过审核创建场次
      * @param createTicketTimesParam 相关参数
      * @return vo
      */
-    TicketTimesPartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<TicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 通过审核后创建场次
      * @param createTicketTimesParam 相关参数
      * @return 相关参数
      */
-    TicketTimesPartnerVo addNewTimes(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<TicketTimesPartnerVo> addNewTimes(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 删除 场次(只有未审核通过可删除)
      * @param ticketTimesId 场次id
      * @return boolean
      */
-    Boolean deleteTimes(String ticketTimesId);
+    ResponseDto<String> deleteTimes(String ticketTimesId);
 
     /**
      * 修改场次信息
      * @param createTicketTimesParam 相关参数
      * @return vo
      */
-    TicketTimesPartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<TicketTimesPartnerVo> changeTimes(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 根据演出id 获取全部场次数据

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketsPartnerService.java

 package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTickets;
@@ -22,42 +23,42 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam);
+    ResponseDto<TicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam);
 
     /**
      * 未通过审核创建票
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    TicketPartnerVo createTicket(TicketCreateParam ticketCreateParam);
+    ResponseDto<TicketPartnerVo> createTicket(TicketCreateParam ticketCreateParam);
 
     /**
      * 通过审核后创建票
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    TicketPartnerVo addNewTicket(TicketCreateParam ticketCreateParam);
+    ResponseDto<TicketPartnerVo> addNewTicket(TicketCreateParam ticketCreateParam);
 
     /**
      * 修改票
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    TicketPartnerVo updateTicket(TicketCreateParam ticketCreateParam);
+    ResponseDto<TicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam);
 
     /**
      * 删除 票(只有未审核通过可删除)
      * @param ticketsId 票id
      * @return boolean
      */
-    boolean deleteTicket(String ticketsId);
+    ResponseDto<String> deleteTicket(String ticketsId);
 
     /**
      * 复制票
      * @param ticketsId 票id
      * @return vo
      */
-    TicketPartnerVo copyTicket(String ticketsId);
+    ResponseDto<TicketPartnerVo> copyTicket(String ticketsId);
 
     /**
      * 整个场次票 提交 审核
@@ -85,14 +86,12 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param ticketsId 票id
      * @return boolean
      */
-    boolean onLine(String ticketsId);
+    ResponseDto<String> onLine(String ticketsId);
 
     /**
      * 票下线
      * @param ticketsId 票id
      * @return boolean
      */
-    boolean outLine(String ticketsId);
-
-    //购票须知
+    ResponseDto<String> outLine(String ticketsId);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/MybatisPlusCodeGenerator.java

@@ -98,7 +98,8 @@ public class MybatisPlusCodeGenerator {
 //        String[] dbTableArray = new String[]{"kylin_fields","kylin_field_status","kylin_field_relations"};
 //        String[] dbTableArray = new String[]{"kylin_performances","kylin_performance_status","kylin_performance_relations"};
 //        String[] dbTableArray = new String[]{"kylin_ticket_status","kylin_ticket_time_relation","kylin_ticket_times","kylin_ticket_relations","kylin_tickets"};
-        String[] dbTableArray = new String[]{"kylin_road_shows"};
+//        String[] dbTableArray = new String[]{"kylin_road_shows"};
+        String[] dbTableArray = new String[]{"kylin_buy_notice"};
 
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/FieldMisDetailsDao.java

@@ -16,15 +16,15 @@ public class FieldMisDetailsDao implements Serializable {
 
     private String coverImg;
 
-    private int provinceId;
+    private Integer provinceId;
 
     private String provinceName;
 
-    private int cityId;
+    private Integer cityId;
 
     private String cityName;
 
-    private int districtId;
+    private Integer districtId;
 
     private String districtName;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java

@@ -16,19 +16,19 @@ public class PerformanceAdminListDao {
     @ApiModelProperty(value = "主办方")
     private String sponsor;
     @ApiModelProperty(value = "演出状态")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "提审时间")
     private String auditTime;
     @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
-    private int auditStatus;
+    private Integer auditStatus;
     @ApiModelProperty(value = "总库存")
-    private int totalGeneral;
+    private Integer totalGeneral;
     @ApiModelProperty(value = "销售库存")
-    private int saleGeneral;
+    private Integer saleGeneral;
     @ApiModelProperty(value = "总销售金额")
-    private int totalSalePrice;
+    private Integer totalSalePrice;
     @ApiModelProperty(value = "剩余库存")
-    private int surplusGeneral;
+    private Integer surplusGeneral;
     @ApiModelProperty(value = "拒绝理由")
     private String rejectTxt;
     @ApiModelProperty(value = "创建时间")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceMemberAuditDao.java

@@ -14,11 +14,11 @@ public class PerformanceMemberAuditDao {
     @ApiModelProperty(value = "演出名称")
     private String title;
     @ApiModelProperty(value = "是否会员")
-    private int isMember;
+    private Integer isMember;
     @ApiModelProperty(value = "是否专属")
-    private int isExclusive;
+    private Integer isExclusive;
     @ApiModelProperty(value = "是否已提交")
-    private int isSubmit;
+    private Integer isSubmit;
     @ApiModelProperty(value = "票种列表")
     private List<TicketMemberAuditDao> ticketMemberAudit;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java

@@ -16,17 +16,19 @@ public class PerformancePartnerListDao {
     @ApiModelProperty(value = "结束时间")
     private String timeEnd;
     @ApiModelProperty(value = "总库存")
-    private int totalGeneral;
+    private Integer totalGeneral;
     @ApiModelProperty(value = "销售库存")
-    private int saleGeneral;
+    private Integer saleGeneral;
     @ApiModelProperty(value = "总销售金额")
-    private int totalSalePrice;
+    private Integer totalSalePrice;
     @ApiModelProperty(value = "总销售金额")
-    private int surplusGeneral;
+    private Integer surplusGeneral;
     @ApiModelProperty(value = "演出状态")
-    private int status;
+    private Integer status;
+    @ApiModelProperty(value = "演出类型")
+    private Integer type;
     @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
-    private int auditStatus;
+    private Integer auditStatus;
     @ApiModelProperty(value = "拒绝理由")
     private String rejectTxt;
     @ApiModelProperty(value = "创建时间")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceRecommendAdminDao.java

@@ -15,7 +15,7 @@ public class PerformanceRecommendAdminDao {
     @ApiModelProperty(value = "演出开始时间")
     private String timeStart;
     @ApiModelProperty(value = "演出状态")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "排序位")
-    private int isRecommend;
+    private Integer isRecommend;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketMemberAuditDao.java

@@ -18,7 +18,7 @@ public class TicketMemberAuditDao {
 //    @ApiModelProperty(value = "使用时间结束")
 //    private String useEnd;
     @ApiModelProperty(value = "状态")
-    private int status;
+    private Integer status;
     @ApiModelProperty(value = "开售时间")
     private String timeStart;
     @ApiModelProperty(value = "原价")
@@ -26,12 +26,12 @@ public class TicketMemberAuditDao {
     @ApiModelProperty(value = "会员优惠价格")
     private BigDecimal priceDiscountMember;
     @ApiModelProperty(value = "会员优惠时间段限购数量")
-    private int memberLimitCount;
+    private Integer memberLimitCount;
     @ApiModelProperty(value = "会员提前开售分钟")
-    private int advanceMinuteMember;
+    private Integer advanceMinuteMember;
     @ApiModelProperty(value = "是否会员")
-    private int isMember;
+    private Integer isMember;
     @ApiModelProperty(value = "是否专属")
-    private int isExclusive;
+    private Integer isExclusive;
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBuyNotice.java

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 购票须知表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinBuyNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * buy_notice_id
+     */
+    private String buyNoticeId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 内容
+     */
+    private String message;
+
+    /**
+     * 状态 1可用 0弃用
+     */
+    private Integer status;
+
+    /**
+     * 排序 大在上
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinBuyNoticeMapper.java

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 购票须知表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+public interface KylinBuyNoticeMapper extends BaseMapper<KylinBuyNotice> {
+
+}