记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 8cb05e2a authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 do

parent 93dd317a
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 128 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/PerformancePartnerDto.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dto; package com.liquidnet.service.kylin.dto;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -9,42 +8,29 @@ import java.io.Serializable; ...@@ -9,42 +8,29 @@ import java.io.Serializable;
@Data @Data
public class BannerDetailsDao implements Serializable { public class BannerDetailsDao implements Serializable {
@ApiModelProperty(value = "Banner主键ID")
private String bannersId; private String bannersId;
@ApiModelProperty(value = "标题")
private String bannersName; private String bannersName;
@ApiModelProperty(value = "封面图")
private String coverImg; private String coverImg;
@ApiModelProperty(value = "跳转类型(由接口提供)")
private String targetType; private String targetType;
@ApiModelProperty(value = "跳转目标 id/url等")
private String targetObj; private String targetObj;
@ApiModelProperty(value = "是否上线展示 0下线 1上线")
private Integer isOnline; private Integer isOnline;
@ApiModelProperty(value = "上线开始时间")
private String onlineStartTime; private String onlineStartTime;
@ApiModelProperty(value = "上线结束时间")
private String onlineEndTime; private String onlineEndTime;
@ApiModelProperty(value = "推广类型 1全国 2省份")
private Integer promotionType; private Integer promotionType;
@ApiModelProperty(value = "排序 越大越靠前")
private Integer bannersSort; private Integer bannersSort;
@ApiModelProperty(value = "备注")
private String remarks; private String remarks;
@ApiModelProperty(value = "创建时间")
private String createdAt; private String createdAt;
@ApiModelProperty(value = "修改时间")
private String updatedAt; private String updatedAt;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsListDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -9,42 +8,29 @@ import java.io.Serializable; ...@@ -9,42 +8,29 @@ import java.io.Serializable;
@Data @Data
public class BannerDetailsListDao implements Serializable { public class BannerDetailsListDao implements Serializable {
@ApiModelProperty(value = "Banner主键ID")
private String bannersId; private String bannersId;
@ApiModelProperty(value = "标题")
private String bannersName; private String bannersName;
@ApiModelProperty(value = "封面图")
private String coverImg; private String coverImg;
@ApiModelProperty(value = "跳转类型(由接口提供)")
private String targetType; private String targetType;
@ApiModelProperty(value = "跳转目标 id/url等")
private String targetObj; private String targetObj;
@ApiModelProperty(value = "是否上线展示 0下线 1上线")
private Integer isOnline; private Integer isOnline;
@ApiModelProperty(value = "上线开始时间")
private String onlineStartTime; private String onlineStartTime;
@ApiModelProperty(value = "上线结束时间")
private String onlineEndTime; private String onlineEndTime;
@ApiModelProperty(value = "推广类型 1全国 2省份")
private Integer promotionType; private Integer promotionType;
@ApiModelProperty(value = "排序 越大越靠前")
private Integer bannersSort; private Integer bannersSort;
@ApiModelProperty(value = "备注")
private String remarks; private String remarks;
@ApiModelProperty(value = "创建时间")
private String createdAt; private String createdAt;
@ApiModelProperty(value = "修改时间")
private String updatedAt; private String updatedAt;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/ChildDetailsDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class ChildDetailsDao { public class ChildDetailsDao {
@ApiModelProperty(value = "主键id")
private String checkUserId; private String checkUserId;
@ApiModelProperty(value = "姓名/昵称")
private String name; private String name;
@ApiModelProperty(value = "手机号")
private String mobile; private String mobile;
@ApiModelProperty(value = "可用状态 0否 1是")
private String status; private String status;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/ChildListDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class ChildListDao { public class ChildListDao {
@ApiModelProperty(value = "主键id")
private String checkUserId; private String checkUserId;
@ApiModelProperty(value = "姓名/昵称")
private String name; private String name;
@ApiModelProperty(value = "手机号")
private String mobile; private String mobile;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/ChildPerformanceDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class ChildPerformanceDao { public class ChildPerformanceDao {
@ApiModelProperty(value = "主键id")
private String performancesId; private String performancesId;
@ApiModelProperty(value = "主键id")
private String title; private String title;
@ApiModelProperty(value = "姓名/昵称")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "手机号")
private String timeEnd; private String timeEnd;
@ApiModelProperty(value = "手机号")
private String canDownTime; private String canDownTime;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class PerformanceAdminListDao { public class PerformanceAdminListDao {
//演出数据 //演出数据
@ApiModelProperty(value = "主键id")
private String performancesId; private String performancesId;
@ApiModelProperty(value = "标题")
private String title; private String title;
@ApiModelProperty(value = "开演时间")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "主办方")
private String sponsor; private String sponsor;
@ApiModelProperty(value = "演出状态")
private Integer status; private Integer status;
@ApiModelProperty(value = "提审时间")
private String auditTime; private String auditTime;
@ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
private Integer auditStatus; private Integer auditStatus;
@ApiModelProperty(value = "总库存")
private Integer totalGeneral; private Integer totalGeneral;
@ApiModelProperty(value = "销售库存")
private Integer saleGeneral; private Integer saleGeneral;
@ApiModelProperty(value = "总销售金额")
private Integer totalSalePrice; private Integer totalSalePrice;
@ApiModelProperty(value = "剩余库存")
private Integer surplusGeneral; private Integer surplusGeneral;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt; private String rejectTxt;
@ApiModelProperty(value = "创建时间")
private String createdAt; private String createdAt;
// 提审账号
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceMemberAuditDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ApiModel
@Data @Data
public class PerformanceMemberAuditDao { public class PerformanceMemberAuditDao {
@ApiModelProperty(value = "演出id")
private String performancesId; private String performancesId;
@ApiModelProperty(value = "演出名称")
private String title; private String title;
@ApiModelProperty(value = "是否会员")
private Integer isMember; private Integer isMember;
@ApiModelProperty(value = "是否专属")
private Integer isExclusive; private Integer isExclusive;
@ApiModelProperty(value = "是否已提交")
private Integer isSubmit; private Integer isSubmit;
@ApiModelProperty(value = "票种列表")
private List<TicketMemberAuditDao> ticketMemberAudit; private List<TicketMemberAuditDao> ticketMemberAudit;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class PerformancePartnerListDao { public class PerformancePartnerListDao {
//演出数据 //演出数据
@ApiModelProperty(value = "主键id")
private String performancesId; private String performancesId;
@ApiModelProperty(value = "标题")
private String title; private String title;
@ApiModelProperty(value = "开演时间")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "结束时间")
private String timeEnd; private String timeEnd;
@ApiModelProperty(value = "总库存")
private Integer totalGeneral; private Integer totalGeneral;
@ApiModelProperty(value = "销售库存")
private Integer saleGeneral; private Integer saleGeneral;
@ApiModelProperty(value = "总销售金额")
private Integer totalSalePrice; private Integer totalSalePrice;
@ApiModelProperty(value = "总销售金额")
private Integer surplusGeneral; private Integer surplusGeneral;
@ApiModelProperty(value = "演出状态")
private Integer status; private Integer status;
@ApiModelProperty(value = "演出类型")
private Integer type; private Integer type;
@ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
private Integer auditStatus; private Integer auditStatus;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt; private String rejectTxt;
@ApiModelProperty(value = "创建时间")
private String createdAt; private String createdAt;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceRecommendAdminDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ApiModel
@Data @Data
public class PerformanceRecommendAdminDao { public class PerformanceRecommendAdminDao {
@ApiModelProperty(value = "演出id")
private String performancesId; private String performancesId;
@ApiModelProperty(value = "演出名称")
private String title; private String title;
@ApiModelProperty(value = "演出开始时间")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "演出状态")
private Integer status; private Integer status;
@ApiModelProperty(value = "排序位")
private Integer isRecommend; private Integer isRecommend;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceTitleDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class PerformanceTitleDao { public class PerformanceTitleDao {
//演出数据 //演出数据
@ApiModelProperty(value = "主键id")
private String performancesId; private String performancesId;
@ApiModelProperty(value = "标题")
private String title; private String title;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/RoadShowAdminListDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class RoadShowAdminListDao { public class RoadShowAdminListDao {
//演出数据 //演出数据
@ApiModelProperty(value = "主键id")
private String roadShowId; private String roadShowId;
@ApiModelProperty(value = "标题")
private String title; private String title;
@ApiModelProperty(value = "开演时间")
private String performanceCount; private String performanceCount;
@ApiModelProperty(value = "创建时间")
private String createdAt; private String createdAt;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketMemberAuditDao.java
View file @ 8cb05e2a
package com.liquidnet.service.kylin.dao; package com.liquidnet.service.kylin.dao;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ApiModel
@Data @Data
public class TicketMemberAuditDao { public class TicketMemberAuditDao {
@ApiModelProperty(value = "演出id")
private String ticketsId; private String ticketsId;
@ApiModelProperty(value = "演出名称")
private String title; private String title;
@ApiModelProperty(value = "适用时间开始")
private String useStart; private String useStart;
// @ApiModelProperty(value = "使用时间结束")
// private String useEnd;
@ApiModelProperty(value = "状态")
private Integer status; private Integer status;
@ApiModelProperty(value = "开售时间")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "原价")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty(value = "会员优惠价格")
private BigDecimal priceDiscountMember; private BigDecimal priceDiscountMember;
@ApiModelProperty(value = "会员优惠时间段限购数量")
private Integer memberLimitCount; private Integer memberLimitCount;
@ApiModelProperty(value = "会员提前开售分钟")
private Integer advanceMinuteMember; private Integer advanceMinuteMember;
@ApiModelProperty(value = "是否会员")
private Integer isMember; private Integer isMember;
@ApiModelProperty(value = "是否专属")
private Integer isExclusive; private Integer isExclusive;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBanners.java
View file @ 8cb05e2a
...@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Transient;
/** /**
* <p> * <p>
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBannersRelations.java
View file @ 8cb05e2a
...@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.entity; ...@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.liquidnet.commons.lang.util.IDGenerator;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -57,10 +55,10 @@ public class KylinBannersRelations implements Serializable { ...@@ -57,10 +55,10 @@ public class KylinBannersRelations implements Serializable {
private String updatedAt; private String updatedAt;
// 整合入库数据 // 整合入库数据
@JsonIgnore // @JsonIgnore
public KylinBannersRelations newData(String bannersId, String fieldId, int fieldIdType, String createdAtString) { public KylinBannersRelations newData(String bannersId, String fieldId, int fieldIdType, String createdAtString) {
String bannersRelationsId = IDGenerator.nextSnowId().toString(); // String bannersRelationsId = IDGenerator.nextSnowId().toString();
this.setBannersRelationsId(bannersRelationsId); // this.setBannersRelationsId(bannersRelationsId);
this.setBannersId(bannersId); this.setBannersId(bannersId);
this.setFieldId(fieldId); this.setFieldId(fieldId);
this.setFieldIdType(fieldIdType); this.setFieldIdType(fieldIdType);
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressTimelinesMapper.java
View file @ 8cb05e2a
...@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.mapper; ...@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.ExpressTimelines; import com.liquidnet.service.kylin.entity.ExpressTimelines;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.entity.Expresses;
import io.swagger.models.auth.In;
import java.util.List; import java.util.List;
......
liquidnet-bus-do/pom.xml
View file @ 8cb05e2a
...@@ -14,8 +14,11 @@ ...@@ -14,8 +14,11 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencies> <modules>
<module>liquidnet-service-kylin-do</module>
</modules>
<dependencies>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment