Merge branch 'dev-chaifen' into dev

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

@@ -2,7 +2,7 @@
 <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-service-adam</artifactId>
+        <artifactId>liquidnet-bus-api</artifactId>
         <groupId>com.liquidnet</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -16,7 +16,6 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
 

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

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 @ApiModel(value = "AdamMemberOrderParam", description = "入场人响应")
 @Data

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 

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

 package com.liquidnet.service.adam.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 会员价格

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

 package com.liquidnet.service.adam.dto.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
-import com.liquidnet.service.adam.entity.AdamMemberCode;
-import com.liquidnet.service.adam.util.MemberUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import io.swagger.annotations.ApiModel;

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

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @ApiModel(value = "ThirdPartInfoVo", description = "用户第三方信息")
 @Data
 public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java → liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.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.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.adam.entity.AdamCollection;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.service;
 
-import com.liquidnet.service.adam.entity.AdamDeviceToken;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.entity.AdamDeviceToken;
 
 /**
  * <p>

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

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
 import com.liquidnet.service.adam.entity.AdamMemberCode;
 
-import java.util.List;
-
 /**
  * 会员码
  */

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

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamThirdParty;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

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

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUserInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 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;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberAdminService.java → liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberAdminService.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamMemberParam;
-import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 
 import java.util.List;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/util/MemberUtil.java → liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/util/MemberUtil.java

 package com.liquidnet.service.adam.util;
 
 import com.liquidnet.commons.lang.util.MD5;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.Random;

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

@@ -3,7 +3,7 @@
          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-service-kylin</artifactId>
+        <artifactId>liquidnet-bus-api</artifactId>
         <groupId>com.liquidnet</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/PerformancePartnerDto.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/PerformancePartnerDto.java

 package com.liquidnet.service.kylin.dto;
 
-import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import lombok.Data;
+
 @Data
 public class PerformancePartnerDto implements Serializable {
 

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

 package com.liquidnet.service.kylin.dto.param;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.entity.KylinFieldRelations;
 import com.liquidnet.service.kylin.entity.KylinFieldStatus;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 /**

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

 package com.liquidnet.service.kylin.dto.param;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.entity.KylinFieldRelations;
-import com.liquidnet.service.kylin.entity.KylinFieldStatus;
-import com.liquidnet.service.kylin.entity.KylinFields;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 /**

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @Data
 public class PayAgainParam {

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.List;
 
 @Data

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

@@ -2,10 +2,8 @@ package com.liquidnet.service.kylin.dto.param;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 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;
 

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

 package com.liquidnet.service.kylin.dto.param;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.dto.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 @Data

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

@@ -2,9 +2,10 @@ package com.liquidnet.service.kylin.dto.param;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.entity.KylinTicketRelations;
+import com.liquidnet.service.kylin.entity.KylinTicketStatus;
+import com.liquidnet.service.kylin.entity.KylinTickets;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 

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

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

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

 package com.liquidnet.service.kylin.dto.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 //返回
 

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

@@ -4,7 +4,6 @@ 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;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 @ApiModel(value = "KylinStationPerformanceVo", description = "演出列表响应参数")

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

 package com.liquidnet.service.kylin.dto.vo;
 
-import com.liquidnet.service.kylin.entity.KylinTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 import io.swagger.annotations.ApiModel;

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

 package com.liquidnet.service.kylin.dto.vo;
 
-import com.liquidnet.service.kylin.entity.Expresses;
 import lombok.Data;
 
 import java.util.List;

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

 package com.liquidnet.service.kylin.dto.vo.ignore;
 
-import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
-import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
-import com.liquidnet.service.kylin.entity.KylinPerformances;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
 @Data
 public class KylinPerformanceIgnoreVo {
 

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

@@ -3,7 +3,6 @@ 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

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

 package com.liquidnet.service.kylin.dto.vo.partner;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/BatchImportParam.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/tmp/BatchImportParam.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.dto.vo.tmp;
 import lombok.Data;
 
 import java.io.File;
-import java.util.List;
 
 @Data
 public class BatchImportParam {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressBatchesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressBatchesService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.ExpressBatches;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.ExpressBatches;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressLogsService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressLogsService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.ExpressLogs;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.ExpressLogs;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressTimelinesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressTimelinesService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.ExpressTimelines;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.ExpressTimelines;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressesService.java

 package com.liquidnet.service.kylin.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.tmp.CourierListVo;
@@ -7,7 +8,6 @@ import com.liquidnet.service.kylin.dto.vo.tmp.KuaidiAdminParam;
 import com.liquidnet.service.kylin.dto.vo.tmp.KuaidiReturn;
 import com.liquidnet.service.kylin.entity.ExpressBatches;
 import com.liquidnet.service.kylin.entity.Expresses;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderRefundsService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderRefundsService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketEntitiesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketEntitiesService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

 package com.liquidnet.service.kylin.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
-import com.liquidnet.service.kylin.dto.vo.*;
+import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.PayResultVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -33,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
     // 同步大麦数据接口
 
     //订单列表(状态 待支付 已支付 倒计时 已失效)
-    PageInfo<List<KylinOrderListVo>> orderList(int page,int size);
+    PageInfo<List<KylinOrderListVo>> orderList(int page, int size);
 
     //订单详情
     OrderDetailsVo orderDetails(String orderId);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinPerformancesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinPerformancesService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRefundBatchesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRefundBatchesService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinRefundBatches;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinRefundBatches;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRefundsService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRefundsService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinRefunds;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinRefunds;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRoadShowsService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRoadShowsService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinRoadShows;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinRoadShows;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTicketTimesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTicketTimesService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTicketsService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTicketsService.java

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.entity.KylinTickets;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinTickets;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinBannersService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinBannersService.java

-package com.liquidnet.service.kylin.service.admin;
-
-import com.liquidnet.service.kylin.entity.KylinBanners;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 轮播图 服务类
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-05-02
- */
-public interface IKylinBannersService extends IService<KylinBanners> {
-
-}
+package com.liquidnet.service.kylin.service.admin;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinBanners;
+
+/**
+ * <p>
+ * 轮播图 服务类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-02
+ */
+public interface IKylinBannersService extends IService<KylinBanners> {
+
+}

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

 package com.liquidnet.service.kylin.service.partner;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

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

 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.ChildDetailsDao;
 import com.liquidnet.service.kylin.dao.ChildListDao;
 import com.liquidnet.service.kylin.entity.KylinCheckUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
 
 /**
  * <p>

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

 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.ChildPerformanceDao;
-import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
 import com.liquidnet.service.kylin.dto.param.CheckUserParam;
 import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
-import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

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

@@ -4,7 +4,10 @@ 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.param.PerformancePartnerListParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 /**

liquidnet-bus-api/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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.liquidnet</groupId>
+    <artifactId>liquidnet-bus-api</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>liquidnet-service-adam-api</module>
+        <module>liquidnet-service-kylin-api</module>
+    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-service-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.2.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <configuration>
+                        <includeSystemScope>true</includeSystemScope><!--外部进行打包-->
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArguments>
+                        <extdirs>libs</extdirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <includeFilterFile>findbugs.xml</includeFilterFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/pom.xml

@@ -70,6 +70,14 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-client-admin-zhengzai</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-kylin-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-adam-api</artifactId>
+        </dependency>
         <!-- 定时任务-->
 <!--        <dependency>-->
 <!--            <groupId>com.liquidnet</groupId>-->

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

@@ -3,7 +3,7 @@
          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-service-adam</artifactId>
+        <artifactId>liquidnet-bus-do</artifactId>
         <groupId>com.liquidnet</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 收货地址

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 收藏

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * TOKEN

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 想去

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 入场人

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -2,10 +2,8 @@ package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 实名信息

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 用户第三方账号信息

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

@@ -2,11 +2,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 用户

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

 package com.liquidnet.service.adam.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+
 /**
  * <p>
  * 用户信息

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamAddresses;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamCollection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamCollection;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamDeviceToken;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamDeviceToken;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamDisposedMapper.java → liquidnet-bus-do/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;
+import com.liquidnet.service.adam.entity.AdamDisposed;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamEnters;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamEnters;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamRealName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamRealName;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamThirdParty;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamThirdParty;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamUserInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamUserInfo;
 
 /**
  * <p>

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

 package com.liquidnet.service.adam.mapper;
 
-import com.liquidnet.service.adam.entity.AdamUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.entity.AdamUser;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/pom.xml → liquidnet-bus-do/liquidnet-service-kylin-do/pom.xml

@@ -3,7 +3,7 @@
          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-service-kylin</artifactId>
+        <artifactId>liquidnet-bus-do</artifactId>
         <groupId>com.liquidnet</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

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

+//package com.liquidnet.service.kylin;
+//
+//import com.baomidou.mybatisplus.core.toolkit.StringPool;
+//import com.baomidou.mybatisplus.generator.AutoGenerator;
+//import com.baomidou.mybatisplus.generator.InjectionConfig;
+//import com.baomidou.mybatisplus.generator.config.*;
+//import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+//import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+//import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//public class MybatisPlusCodeGenerator {
+//    /**
+//     * @param moduleRootPath 项目模块根路径 到 /src 之前 ex：E:\projects\trlabs-bus-v1\trlabs-bus-service\trlabs-common\trlabs-mybatis
+//     * @param dsc            数据源
+//     * @param parentName     相当于业务模块名 com.liquidnet.service.kylin 全限定类名
+//     * @param tableNames     表名
+//     */
+//    public static void doGenerator(String moduleRootPath,
+//                                   DataSourceConfig dsc,
+//                                   String parentName,
+//                                   String[] tableNames) {
+//        AutoGenerator mpg = new AutoGenerator();
+//        // 全局配置BankMybatisPlusCodeGenerator
+//        GlobalConfig gc = new GlobalConfig();
+//        gc.setOutputDir(moduleRootPath + "/src/main/java");
+//        gc.setAuthor("liquidnet");
+//        gc.setOpen(false);
+//        // gc.setSwagger2(true); 实体属性 Swagger2 注解
+//        mpg.setGlobalConfig(gc);
+//
+//        // 数据源配置
+//        mpg.setDataSource(dsc);
+//
+//        // 包配置
+//        PackageConfig pc = new PackageConfig();
+//        pc.setParent(parentName);
+//        mpg.setPackageInfo(pc);
+//
+//        // 自定义配置
+//        InjectionConfig cfg = new InjectionConfig() {
+//            @Override
+//            public void initMap() {
+//                // to do nothing
+//            }
+//        };
+//
+//        // 如果模板引擎是 freemarker
+//        String templatePath = "/templates/mapper.xml.ftl";
+//        // 自定义输出配置
+//        List<FileOutConfig> focList = new ArrayList<>();
+//        // 自定义配置会被优先输出
+//        focList.add(new FileOutConfig(templatePath) {
+//            @Override
+//            public String outputFile(TableInfo tableInfo) {
+//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+//                return moduleRootPath + "/src/main/resources/com/liquidnet/service/kylin/mapper/" + pc.getModuleName()
+//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+//            }
+//        });
+//        cfg.setFileOutConfigList(focList);
+//        mpg.setCfg(cfg);
+//
+//        // 配置模板
+//        TemplateConfig templateConfig = new TemplateConfig();
+//
+//        templateConfig.setXml(null);
+//        mpg.setTemplate(templateConfig);
+//
+//        // 策略配置
+//        StrategyConfig strategy = new StrategyConfig();
+//        strategy.setNaming(NamingStrategy.underline_to_camel);
+//        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+//        // strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
+//        strategy.setEntityLombokModel(true);
+//        strategy.setRestControllerStyle(true);
+//        strategy.setInclude(tableNames);
+//        strategy.setControllerMappingHyphenStyle(true);
+//        strategy.setTablePrefix(pc.getModuleName() + "_");
+//        mpg.setStrategy(strategy);
+//        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+//        mpg.execute();
+//    }
+//
+//    public static void main(String[] args) {
+//
+//        DataSourceConfig dsc = new DataSourceConfig();
+////        dsc.setSchemaName("public");
+//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+//        dsc.setUrl("jdbc:mysql://39.106.122.201:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
+//        dsc.setUsername("testmall");
+//        dsc.setPassword("zhengzai!mYT");
+//
+//        String resourcePath = "/Users/hujiachen/Downloads/tmp";
+//        String directory = "com.liquidnet.service.kylin";
+////        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_buy_notice"};
+////        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
+////        String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
+//        String[] dbTableArray = new String[]{"express_batches","express_logs","express_timelines","expresses"};
+//
+//        doGenerator(resourcePath, dsc, directory, dbTableArray);
+//    }
+//}

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

 package com.liquidnet.service.kylin.dao;
 
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,42 +8,29 @@ import java.io.Serializable;
 @Data
 public class BannerDetailsDao implements Serializable {
 
-    @ApiModelProperty(value = "Banner主键ID")
     private String bannersId;
 
-    @ApiModelProperty(value = "标题")
     private String bannersName;
 
-    @ApiModelProperty(value = "封面图")
     private String coverImg;
 
-    @ApiModelProperty(value = "跳转类型(由接口提供)")
     private String targetType;
 
-    @ApiModelProperty(value = "跳转目标 id/url等")
     private String targetObj;
 
-    @ApiModelProperty(value = "是否上线展示 0下线 1上线")
     private Integer isOnline;
 
-    @ApiModelProperty(value = "上线开始时间")
     private String onlineStartTime;
 
-    @ApiModelProperty(value = "上线结束时间")
     private String onlineEndTime;
 
-    @ApiModelProperty(value = "推广类型 1全国 2省份")
     private Integer promotionType;
 
-    @ApiModelProperty(value = "排序 越大越靠前")
     private Integer bannersSort;
 
-    @ApiModelProperty(value = "备注")
     private String remarks;
 
-    @ApiModelProperty(value = "创建时间")
     private String  createdAt;
 
-    @ApiModelProperty(value = "修改时间")
     private String updatedAt;
 }

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

 package com.liquidnet.service.kylin.dao;
 
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,42 +8,29 @@ import java.io.Serializable;
 @Data
 public class BannerDetailsListDao implements Serializable {
 
-    @ApiModelProperty(value = "Banner主键ID")
     private String bannersId;
 
-    @ApiModelProperty(value = "标题")
     private String bannersName;
 
-    @ApiModelProperty(value = "封面图")
     private String coverImg;
 
-    @ApiModelProperty(value = "跳转类型(由接口提供)")
     private String targetType;
 
-    @ApiModelProperty(value = "跳转目标 id/url等")
     private String targetObj;
 
-    @ApiModelProperty(value = "是否上线展示 0下线 1上线")
     private Integer isOnline;
 
-    @ApiModelProperty(value = "上线开始时间")
     private String onlineStartTime;
 
-    @ApiModelProperty(value = "上线结束时间")
     private String onlineEndTime;
 
-    @ApiModelProperty(value = "推广类型 1全国 2省份")
     private Integer promotionType;
 
-    @ApiModelProperty(value = "排序 越大越靠前")
     private Integer bannersSort;
 
-    @ApiModelProperty(value = "备注")
     private String remarks;
 
-    @ApiModelProperty(value = "创建时间")
     private String  createdAt;
 
-    @ApiModelProperty(value = "修改时间")
     private String updatedAt;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChildDetailsDao {
 
-    @ApiModelProperty(value = "主键id")
     private String checkUserId;
 
-    @ApiModelProperty(value = "姓名/昵称")
     private String name;
 
-    @ApiModelProperty(value = "手机号")
     private String mobile;
 
-    @ApiModelProperty(value = "可用状态 0否 1是")
     private String status;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChildListDao {
 
-    @ApiModelProperty(value = "主键id")
     private String checkUserId;
 
-    @ApiModelProperty(value = "姓名/昵称")
     private String name;
 
-    @ApiModelProperty(value = "手机号")
     private String mobile;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChildPerformanceDao {
 
-    @ApiModelProperty(value = "主键id")
     private String performancesId;
-
-    @ApiModelProperty(value = "主键id")
     private String title;
-
-    @ApiModelProperty(value = "姓名/昵称")
     private String timeStart;
-
-    @ApiModelProperty(value = "手机号")
     private String timeEnd;
-
-    @ApiModelProperty(value = "手机号")
     private String canDownTime;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class PerformanceAdminListDao {
 
     //演出数据
-    @ApiModelProperty(value = "主键id")
     private String performancesId;
-    @ApiModelProperty(value = "标题")
     private String title;
-    @ApiModelProperty(value = "开演时间")
     private String timeStart;
-    @ApiModelProperty(value = "主办方")
     private String sponsor;
-    @ApiModelProperty(value = "演出状态")
     private Integer status;
-    @ApiModelProperty(value = "提审时间")
     private String auditTime;
-    @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
     private Integer auditStatus;
-    @ApiModelProperty(value = "总库存")
     private Integer totalGeneral;
-    @ApiModelProperty(value = "销售库存")
     private Integer saleGeneral;
-    @ApiModelProperty(value = "总销售金额")
     private Integer totalSalePrice;
-    @ApiModelProperty(value = "剩余库存")
     private Integer surplusGeneral;
-    @ApiModelProperty(value = "拒绝理由")
     private String rejectTxt;
-    @ApiModelProperty(value = "创建时间")
     private String createdAt;
-    // 提审账号
 
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
-@ApiModel
 @Data
 public class PerformanceMemberAuditDao {
-    @ApiModelProperty(value = "演出id")
     private String performancesId;
-    @ApiModelProperty(value = "演出名称")
     private String title;
-    @ApiModelProperty(value = "是否会员")
     private Integer isMember;
-    @ApiModelProperty(value = "是否专属")
     private Integer isExclusive;
-    @ApiModelProperty(value = "是否已提交")
     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 → liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class PerformancePartnerListDao {
 
     //演出数据
-    @ApiModelProperty(value = "主键id")
     private String performancesId;
-    @ApiModelProperty(value = "标题")
     private String title;
-    @ApiModelProperty(value = "开演时间")
     private String timeStart;
-    @ApiModelProperty(value = "结束时间")
     private String timeEnd;
-    @ApiModelProperty(value = "总库存")
     private Integer totalGeneral;
-    @ApiModelProperty(value = "销售库存")
     private Integer saleGeneral;
-    @ApiModelProperty(value = "总销售金额")
     private Integer totalSalePrice;
-    @ApiModelProperty(value = "总销售金额")
     private Integer surplusGeneral;
-    @ApiModelProperty(value = "演出状态")
     private Integer status;
-    @ApiModelProperty(value = "演出类型")
     private Integer type;
-    @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
     private Integer auditStatus;
-    @ApiModelProperty(value = "拒绝理由")
     private String rejectTxt;
-    @ApiModelProperty(value = "创建时间")
     private String createdAt;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@ApiModel
 @Data
 public class PerformanceRecommendAdminDao {
 
-    @ApiModelProperty(value = "演出id")
     private String performancesId;
-    @ApiModelProperty(value = "演出名称")
     private String title;
-    @ApiModelProperty(value = "演出开始时间")
     private String timeStart;
-    @ApiModelProperty(value = "演出状态")
     private Integer status;
-    @ApiModelProperty(value = "排序位")
     private Integer isRecommend;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class PerformanceTitleDao {
 
     //演出数据
-    @ApiModelProperty(value = "主键id")
     private String performancesId;
-    @ApiModelProperty(value = "标题")
     private String title;
 
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class RoadShowAdminListDao {
 
     //演出数据
-    @ApiModelProperty(value = "主键id")
     private String roadShowId;
-    @ApiModelProperty(value = "标题")
     private String title;
-    @ApiModelProperty(value = "开演时间")
     private String performanceCount;
-    @ApiModelProperty(value = "创建时间")
     private String createdAt;
 }

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

 package com.liquidnet.service.kylin.dao;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
-@ApiModel
 @Data
 public class TicketMemberAuditDao {
-    @ApiModelProperty(value = "演出id")
     private String ticketsId;
-    @ApiModelProperty(value = "演出名称")
     private String title;
-    @ApiModelProperty(value = "适用时间开始")
     private String useStart;
-//    @ApiModelProperty(value = "使用时间结束")
-//    private String useEnd;
-    @ApiModelProperty(value = "状态")
     private Integer status;
-    @ApiModelProperty(value = "开售时间")
     private String timeStart;
-    @ApiModelProperty(value = "原价")
     private BigDecimal price;
-    @ApiModelProperty(value = "会员优惠价格")
     private BigDecimal priceDiscountMember;
-    @ApiModelProperty(value = "会员优惠时间段限购数量")
     private Integer memberLimitCount;
-    @ApiModelProperty(value = "会员提前开售分钟")
     private Integer advanceMinuteMember;
-    @ApiModelProperty(value = "是否会员")
     private Integer isMember;
-    @ApiModelProperty(value = "是否专属")
     private Integer isExclusive;
 
 }

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

-package com.liquidnet.service.kylin.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Transient;
-
-/**
- * <p>
- * 轮播图 模型
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-05-02
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class KylinBanners implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
-
-    /**
-     * banners_id
-     */
-    private String bannersId;
-
-    /**
-     * 标题
-     */
-    private String bannersName;
-
-    /**
-     * 封面图
-     */
-    private String coverImg;
-
-    /**
-     * 跳转类型
-     */
-    private Integer targetType;
-
-    /**
-     * 跳转目标id或者url
-     */
-    private String targetObj;
-
-    /**
-     * 是否上线展示 0下线 1上线
-     */
-    private Integer isOnline;
-
-    /**
-     * 上线开始时间
-     */
-    private String onlineStartTime;
-
-    /**
-     * 上线结束时间
-     */
-    private String onlineEndTime;
-
-    /**
-     * 推广类型 1全国 2省份
-     */
-    private Integer promotionType;
-
-    /**
-     * 排序权重
-     */
-    private Integer BannersSort;
-
-    /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
-     * 位置
-     */
-    @TableField(exist = false)
-    private List<String> positionList;
-
-    /**
-     * 城市
-     */
-    @TableField(exist = false)
-    private List<String> provincesList;
-
-    /**
-     * 是否删除 1正常 已删除
-     */
-    private Integer isDeleted;
-
-    /**
-     * 创建时间
-     */
-    private String createdAt;
-
-    /**
-     * 修改时间
-     */
-    private String updatedAt;
-
-
-}
+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 轮播图 模型
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinBanners implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * banners_id
+     */
+    private String bannersId;
+
+    /**
+     * 标题
+     */
+    private String bannersName;
+
+    /**
+     * 封面图
+     */
+    private String coverImg;
+
+    /**
+     * 跳转类型
+     */
+    private Integer targetType;
+
+    /**
+     * 跳转目标id或者url
+     */
+    private String targetObj;
+
+    /**
+     * 是否上线展示 0下线 1上线
+     */
+    private Integer isOnline;
+
+    /**
+     * 上线开始时间
+     */
+    private String onlineStartTime;
+
+    /**
+     * 上线结束时间
+     */
+    private String onlineEndTime;
+
+    /**
+     * 推广类型 1全国 2省份
+     */
+    private Integer promotionType;
+
+    /**
+     * 排序权重
+     */
+    private Integer BannersSort;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 位置
+     */
+    @TableField(exist = false)
+    private List<String> positionList;
+
+    /**
+     * 城市
+     */
+    @TableField(exist = false)
+    private List<String> provincesList;
+
+    /**
+     * 是否删除 1正常 已删除
+     */
+    private Integer isDeleted;
+
+    /**
+     * 创建时间
+     */
+    private String createdAt;
+
+    /**
+     * 修改时间
+     */
+    private String updatedAt;
+
+
+}

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

@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.liquidnet.commons.lang.util.IDGenerator;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -57,10 +55,10 @@ public class KylinBannersRelations implements Serializable {
     private String updatedAt;
 
     // 整合入库数据
-    @JsonIgnore
+//    @JsonIgnore
     public KylinBannersRelations newData(String bannersId, String fieldId, int fieldIdType, String createdAtString) {
-        String bannersRelationsId = IDGenerator.nextSnowId().toString();
-        this.setBannersRelationsId(bannersRelationsId);
+//        String bannersRelationsId = IDGenerator.nextSnowId().toString();
+//        this.setBannersRelationsId(bannersRelationsId);
         this.setBannersId(bannersId);
         this.setFieldId(fieldId);
         this.setFieldIdType(fieldIdType);

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

@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.mapper;
 
 import com.liquidnet.service.kylin.entity.ExpressTimelines;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.kylin.entity.Expresses;
-import io.swagger.models.auth.In;
 
 import java.util.List;
 

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

-package com.liquidnet.service.kylin.mapper;
-
-import com.liquidnet.service.kylin.dao.BannerDetailsDao;
-import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
-import com.liquidnet.service.kylin.entity.KylinBanners;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 轮播图 Mapper 接口 处理数据库
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-05-01
- */
-public interface KylinBannersMapper extends BaseMapper<KylinBanners> {
-    // 详情
-    BannerDetailsDao detail(String bannersId);
-    //列表
-    List<BannerDetailsListDao> searchBannersList(Map<String,Object> map);
-    //分页数量
-    long searchBannersCount(Map<String,Object> map);
-}
+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.dao.BannerDetailsDao;
+import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
+import com.liquidnet.service.kylin.entity.KylinBanners;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 轮播图 Mapper 接口 处理数据库
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-01
+ */
+public interface KylinBannersMapper extends BaseMapper<KylinBanners> {
+    // 详情
+    BannerDetailsDao detail(String bannersId);
+    //列表
+    List<BannerDetailsListDao> searchBannersList(Map<String,Object> map);
+    //分页数量
+    long searchBannersCount(Map<String,Object> map);
+}

liquidnet-bus-do/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>spring-boot-starter-parent</artifactId>
+        <groupId>org.springframework.boot</groupId>
+        <version>2.2.2.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-bus-do</artifactId>
+    <groupId>com.liquidnet</groupId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>liquidnet-service-kylin-do</module>
+        <module>liquidnet-service-adam-do</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.73</version>
+        </dependency>
+
+    </dependencies>
+</project>

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

@@ -11,8 +11,8 @@
     <artifactId>liquidnet-service-adam</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>liquidnet-service-adam-do</module>
-        <module>liquidnet-service-adam-api</module>
+<!--        <module>liquidnet-service-adam-do</module>-->
+<!--        <module>liquidnet-service-adam-api</module>-->
         <module>liquidnet-service-adam-impl</module>
     </modules>
 

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

-package com.liquidnet.service.kylin;
-
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MybatisPlusCodeGenerator {
-    /**
-     * @param moduleRootPath 项目模块根路径 到 /src 之前 ex：E:\projects\trlabs-bus-v1\trlabs-bus-service\trlabs-common\trlabs-mybatis
-     * @param dsc            数据源
-     * @param parentName     相当于业务模块名 com.liquidnet.service.kylin 全限定类名
-     * @param tableNames     表名
-     */
-    public static void doGenerator(String moduleRootPath,
-                                   DataSourceConfig dsc,
-                                   String parentName,
-                                   String[] tableNames) {
-        AutoGenerator mpg = new AutoGenerator();
-        // 全局配置BankMybatisPlusCodeGenerator
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(moduleRootPath + "/src/main/java");
-        gc.setAuthor("liquidnet");
-        gc.setOpen(false);
-        // gc.setSwagger2(true); 实体属性 Swagger2 注解
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setParent(parentName);
-        mpg.setPackageInfo(pc);
-
-        // 自定义配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                // to do nothing
-            }
-        };
-
-        // 如果模板引擎是 freemarker
-        String templatePath = "/templates/mapper.xml.ftl";
-        // 自定义输出配置
-        List<FileOutConfig> focList = new ArrayList<>();
-        // 自定义配置会被优先输出
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                return moduleRootPath + "/src/main/resources/com/liquidnet/service/kylin/mapper/" + pc.getModuleName()
-                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        // 配置模板
-        TemplateConfig templateConfig = new TemplateConfig();
-
-        templateConfig.setXml(null);
-        mpg.setTemplate(templateConfig);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        // strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setInclude(tableNames);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setTablePrefix(pc.getModuleName() + "_");
-        mpg.setStrategy(strategy);
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-    }
-
-    public static void main(String[] args) {
-
-        DataSourceConfig dsc = new DataSourceConfig();
-//        dsc.setSchemaName("public");
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUrl("jdbc:mysql://39.106.122.201:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
-        dsc.setUsername("testmall");
-        dsc.setPassword("zhengzai!mYT");
-
-        String resourcePath = "/Users/hujiachen/Downloads/tmp";
-        String directory = "com.liquidnet.service.kylin";
-//        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_buy_notice"};
-//        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
-//        String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
-        String[] dbTableArray = new String[]{"express_batches","express_logs","express_timelines","expresses"};
-
-        doGenerator(resourcePath, dsc, directory, dbTableArray);
-    }
-}

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

@@ -13,8 +13,8 @@
     <packaging>pom</packaging>
     <modules>
         <module>liquidnet-service-kylin-impl</module>
-        <module>liquidnet-service-kylin-do</module>
-        <module>liquidnet-service-kylin-api</module>
+<!--        <module>liquidnet-service-kylin-do</module>-->
+<!--        <module>liquidnet-service-kylin-api</module>-->
     </modules>
 
     <dependencies>

liquidnet-bus-service/pom.xml

@@ -150,27 +150,27 @@
             <artifactId>guava</artifactId>
             <version>29.0-jre</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.73</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba</groupId>-->
+<!--            <artifactId>fastjson</artifactId>-->
+<!--            <version>1.2.73</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
         </dependency>
         <!-- mybatis plus begin -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.4.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.4.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-generator</artifactId>-->
+<!--            <version>3.4.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>