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

Skip to content

L
liquidnet-bus-v1
Commit a1f45599 authored by 洪全海's avatar 洪全海
Browse files
Options

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

parents 193b76f6 ec18762f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1759 additions and 501 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @ a1f45599
......@@ -4,7 +4,10 @@ public class KylinRedisConst {
public static final String FIELDS = "kylin:fields:id";
public static final String PERFORMANCES = "kylin:performances:id";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:id";
public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:";
public static final String SURPLUS_GENERAL = "surplusGeneral";
public static final String SURPLUS_EXCHANGE = "surplusExchange";
public static final String TICKET = "kylin:ticket:id";
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateRoadShowParam.java
View file @ a1f45599
......@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
......@@ -12,6 +13,7 @@ public class CreateRoadShowParam implements Serializable {
@ApiModelProperty(value = "巡演主键", example = "")
private String roadShowsId;
@ApiModelProperty(value = "标题", example = "")
@NotNull(message = "不能为空")
private String title;
// @ApiModelProperty(value = "场地主键", example = "测试场地")
// private String imgPoster;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateTicketTimesParam.java
View file @ a1f45599
......@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
......@@ -14,6 +15,7 @@ public class CreateTicketTimesParam implements Serializable {
private String ticketTimesId;
@ApiModelProperty(value = "演出Id", example = "1")
@NotNull(message = "不能为空")
private String PerformancesId;
@ApiModelProperty(value = "场次标题", example = "测试标题")
......@@ -21,12 +23,15 @@ public class CreateTicketTimesParam implements Serializable {
private String title;
@ApiModelProperty(value = "场次适用开始时间", example = "2020-12-01T12:00:00")
@NotNull(message = "不能为空")
private LocalDateTime useStart;
@ApiModelProperty(value = "场次适用结束时间", example = "2020-12-01T12:00:00")
@NotNull(message = "不能为空")
private LocalDateTime useEnd;
@ApiModelProperty(value = "类型 1单日票 2通票", example = "1")
@NotNull(message = "不能为空")
private int type;
@ApiModelProperty(value = "", example = "")
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java
View file @ a1f45599
......@@ -3,21 +3,27 @@ package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class PerformanceAdminListParam {
@ApiModelProperty(value = "演出名称", example = "")
private String title;
@ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
@NotNull(message = "不能为空")
private int status;
@ApiModelProperty(value = "城市名称", example = "")
private String cityName;
@ApiModelProperty(value = "-2全部,0审核中，2审核拒绝", example = "0")
@NotNull(message = "不能为空")
private int auditStatus;
@ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00")
private String stopSellTime;
@ApiModelProperty(value = "页数", example = "0")
@NotNull(message = "不能为空")
private int page;
@ApiModelProperty(value = "数量", example = "20")
@NotNull(message = "不能为空")
private int size;
@ApiModelProperty(value = "排序字段", hidden = true)
private String orderItem;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceParam.java 0 → 100644
View file @ a1f45599
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 java.io.Serializable;
@Data
public class PerformanceParam implements Serializable {
@ApiModelProperty(value = "演出id", example = "")
@JsonIgnore
private String performancesId;
@ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
private String imgPoster;
@ApiModelProperty(value = "演出名称", example = "测试演出")
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
private int type;
@ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
private String timeStart;
@ApiModelProperty(value = "演出结束时间", example = "2021-05-04 12:00:00")
private String timeEnd;
@ApiModelProperty(value = "场地id", example = "1")
private String fieldId;
@ApiModelProperty(value = "场地id", example = "1")
private String fieldName;
@ApiModelProperty(value = "演出公告", example = "这是演出公告")
private String notice;
@ApiModelProperty(value = "主办方id", example = "1")
private String sponsorId;
@ApiModelProperty(value = "主办方类型", example = "1")
private String sponsorType;
@ApiModelProperty(value = "主办方名称", example = "主办方名称")
private String sponsor;
@ApiModelProperty(value = "联系人", example = "联系人")
private String contacts;
@ApiModelProperty(value = "联系方式", example = "手机号")
private String mobile;
@ApiModelProperty(value = "演出详情", example = "<p>演出详情</p>")
private String details;
@ApiModelProperty(value = "演出批文地址", example = "这是一个演出批文地址")
private String approvalUrl;
@ApiModelProperty(value = "待支付时间", example = "5")
private int payCountdownMinute;
@ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
private String noticeImage;
@ApiModelProperty(value = "是否实名", example = "0")
private int isTrueName;
@ApiModelProperty(value = "限购数量 0为不限购", example = "0")
private int limitCount;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
private int isSubmit;
@ApiModelProperty(value = "状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "0")
private int status;
@ApiModelProperty(value = "第三方id", example = "0")
private String merchantId;
@ApiModelProperty(value = "演出简介", example = "0")
private String describes;
@ApiModelProperty(value = "是否售卖", example = "0")
private int statusSell;
@ApiModelProperty(value = "巡演id", example = "0",hidden = true)
private String roadShowId;
@ApiModelProperty(value = "搭售id", example = "0",hidden = true)
private String projectId;
@ApiModelProperty(value = "", example = "")
private String createdAt;
@ApiModelProperty(value = "", example = "")
private String updatedAt;
@ApiModelProperty(value = "是否保存", example = "")
private int isCreateSave;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerListParam.java
View file @ a1f45599
......@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@Data
......@@ -10,20 +11,25 @@ public class PerformancePartnerListParam {
@ApiModelProperty(value = "演出名称", example = "")
private String title;
@ApiModelProperty(value = "-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;", example = "0")
@NotNull(message = "不能为空")
private int status;
@ApiModelProperty(value = "-2全部,-1未提交审核，0审核中，1审核通过，2审核拒绝", example = "0")
@NotNull(message = "不能为空")
private int auditStatus;
@ApiModelProperty(value = "演出开始时间", example = "2000-01-01 12:00:00")
private String timeStart;
@ApiModelProperty(value = "演出结束时间", example = "2000-01-01 12:00:00")
private String timeEnd;
@ApiModelProperty(value = "排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序", example = "0")
@NotNull(message = "不能为空")
private int orderType;
@ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00")
private String stopSellTime;
@ApiModelProperty(value = "页数", example = "0")
@NotNull(message = "不能为空")
private int page;
@ApiModelProperty(value = "数量", example = "20")
@NotNull(message = "不能为空")
private int size;
@ApiModelProperty(value = "排序字段", hidden = true)
private String orderItem;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceRecommendAdminParam.java 0 → 100644
View file @ a1f45599
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel
@Data
public class PerformanceRecommendAdminParam {
@ApiModelProperty(value = "演出id")
private String performanceId;
@ApiModelProperty(value = "推荐位")
private int isRecommend;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep1Param.java
View file @ a1f45599
......@@ -4,34 +4,40 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@Data
public class PerformanceStep1Param implements Serializable {
@ApiModelProperty(value = "演出id", example = "")
@JsonIgnore
private String performancesId;
@ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
@NotNull(message = "不能为空")
private String imgPoster;
@ApiModelProperty(value = "第三方id", example = "0")
private String merchantId;
@ApiModelProperty(value = "演出名称", example = "测试演出")
@NotNull(message = "不能为空")
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
@ApiModelProperty(value = "1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演", example = "3")
@NotNull(message = "不能为空")
private int type;
@ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
@NotNull(message = "不能为空")
private String timeStart;
@ApiModelProperty(value = "演出结束时间", example = "2021-05-04 12:00:00")
@NotNull(message = "不能为空")
private String timeEnd;
@ApiModelProperty(value = "场地id", example = "1")
@NotNull(message = "不能为空")
private String fieldId;
@ApiModelProperty(value = "场地名称", example = "")
......@@ -41,6 +47,7 @@ public class PerformanceStep1Param implements Serializable {
private String notice;
@ApiModelProperty(value = "主办方id", example = "1")
@NotNull(message = "不能为空")
private String sponsorId;
@ApiModelProperty(value = "主办方类型", example = "1")
......@@ -50,21 +57,27 @@ public class PerformanceStep1Param implements Serializable {
private String sponsor;
@ApiModelProperty(value = "联系人", example = "联系人")
@NotNull(message = "不能为空")
private String contacts;
@ApiModelProperty(value = "联系方式", example = "手机号")
@NotNull(message = "不能为空")
private String mobile;
@ApiModelProperty(value = "演出详情", example = "<p>演出详情</p>")
@NotNull(message = "不能为空")
private String details;
@ApiModelProperty(value = "演出批文地址", example = "这是一个演出批文地址")
@NotNull(message = "不能为空")
private String approvalUrl;
@ApiModelProperty(value = "待支付时间", example = "5")
@NotNull(message = "不能为空")
private int payCountdownMinute;
@ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
@NotNull(message = "不能为空")
private String noticeImage;
@ApiModelProperty(value = "演出简介", example = "")
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java
View file @ a1f45599
......@@ -5,6 +5,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
......@@ -12,15 +13,19 @@ import java.util.List;
public class PerformanceStep2Param implements Serializable {
@ApiModelProperty(value = "演出id", example = "")
@NotNull(message = "不能为空")
private String performancesId;
@ApiModelProperty(value = "是否实名", example = "0")
@NotNull(message = "不能为空")
private int isTrueName;
@ApiModelProperty(value = "限购数量 0为不限购", example = "0")
@NotNull(message = "不能为空")
private int limitCount;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
@NotNull(message = "不能为空")
private int isSubmit;
@ApiModelProperty(value = "场次数据",hidden = true)
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java
View file @ a1f45599
......@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
......@@ -21,42 +22,53 @@ public class TicketCreateParam implements Serializable {
private String ticketsId;
@ApiModelProperty(value = "场次Id")
@NotNull(message = "不能为空")
private String timesId;
@ApiModelProperty(value = "票种名称", example = "测试票")
@NotNull(message = "不能为空")
private String title;
// @ApiModelProperty(value = "类型", example = "2")
// private int type;
@ApiModelProperty(value = "是否学生票 0否 1是", example = "0")
@NotNull(message = "不能为空")
private int isStudent;
@ApiModelProperty(value = "是否电子票", example = "0")
@NotNull(message = "不能为空")
private int isElectronic;
@ApiModelProperty(value = "是否快递票", example = "0")
@NotNull(message = "不能为空")
private int isExpress;
@ApiModelProperty(value = "价格", example = "100.00")
@NotNull(message = "不能为空")
private BigDecimal price;
@ApiModelProperty(value = "快递票截止日期", example = "2020-12-01T12:00:00")
private LocalDateTime timeEndExpress;
@ApiModelProperty(value = "总库存", example = "100")
@NotNull(message = "不能为空")
private int totalGeneral;
@ApiModelProperty(value = "总兑换库存", example = "100")
@NotNull(message = "不能为空")
private int totalExchange;
@ApiModelProperty(value = "限购数量", example = "0")
@NotNull(message = "不能为空")
private int limitCount;
@ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
@NotNull(message = "不能为空")
private LocalDateTime timeStart;
@ApiModelProperty(value = "票种结售时间", example = "2020-12-01T14:00:00")
@NotNull(message = "不能为空")
private LocalDateTime timeEnd;
@ApiModelProperty(value = "票种说明", example = "这是票种说明")
......@@ -69,6 +81,7 @@ public class TicketCreateParam implements Serializable {
private LocalDateTime qrCodeShowTime;
@ApiModelProperty(value = "是否开启缺票登记", example = "1")
@NotNull(message = "不能为空")
private int isLackRegister;
@ApiModelProperty(value = "", hidden = true)
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java
View file @ a1f45599
......@@ -20,6 +20,8 @@ public class PerformanceVo {
private String performancesId;
@ApiModelProperty(value = "演出名称")
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private int type;
@ApiModelProperty(value = "演出开始时间")
private String timeStart;
@ApiModelProperty(value = "演出结束时间")
......@@ -42,7 +44,7 @@ public class PerformanceVo {
private String roadShowId;
//@ApiModelProperty(value = "巡演相关")
// private String roadShow;
// private String roadShowId;
// OSS
// @ApiModelProperty(value = "演出详情")
// private String details;
......@@ -50,6 +52,8 @@ public class PerformanceVo {
// @ApiModelProperty(value = "购票须知")
// private String noticeImage;
@ApiModelProperty(value = "推荐顺序 0为不推荐")
private int isRecommend;
@ApiModelProperty(value = "状态")
private int appStatus;
@ApiModelProperty(value = "是否可买")
......@@ -69,6 +73,7 @@ public class PerformanceVo {
this.title = performance.getTitle();
this.timeStart = performance.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
this.timeEnd = performance.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
this.type = performance.getType();
}
public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime) {
......@@ -86,14 +91,15 @@ public class PerformanceVo {
public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {
this.statusSell = performanceStatus.getStatusSell();
this.isRecommend = performanceStatus.getIsRecommend();
}
//TODO 巡演 搭售 场地
public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
this.fieldId = "";
this.fieldId = performanceRelations.getFieldId();
this.fieldName = "";
this.cityId = "";
this.projectId = "";
this.roadShowId = "";
this.projectId = performanceRelations.getProjectId();
this.roadShowId = performanceRelations.getRoadShowId();
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/PerformanceIgnoreVo.java
View file @ a1f45599
......@@ -17,6 +17,8 @@ public class PerformanceIgnoreVo {
private String performancesId;
@ApiModelProperty(value = "演出名称")
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private int type;
@ApiModelProperty(value = "演出开始时间")
private String timeStart;
@ApiModelProperty(value = "演出结束时间")
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceCreatePartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceMisVo.java
View file @ a1f45599
......@@ -6,7 +6,7 @@ import lombok.Data;
import java.util.List;
@Data
public class PerformanceCreatePartnerVo {
public class PerformanceMisVo {
//演出数据
@ApiModelProperty(value = "主键id")
......@@ -111,6 +111,12 @@ public class PerformanceCreatePartnerVo {
@ApiModelProperty(value = "第三方id")
private String merchantId;
@ApiModelProperty(value = "巡演id")
private String roadShowId;
@ApiModelProperty(value = "搭售id")
private String projectId;
//场次数据
@ApiModelProperty(value = "场次数据")
private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerListVo.java
View file @ a1f45599
package com.liquidnet.service.kylin.dto.vo.partner;
import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
import com.liquidnet.service.kylin.dto.param.PerformanceParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class PerformancePartnerListVo {
......@@ -36,7 +34,7 @@ public class PerformancePartnerListVo {
private String createdAt;
@ApiModelProperty(value = "返回数据赋值",hidden = true)
public void setStatus0Data(PerformanceCreateParam item){
public void setStatus0Data(PerformanceParam item){
this.performancesId=item.getPerformancesId();
this.title=item.getTitle();
this.timeStart=item.getTimeStart();
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceCreateParam.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerVo.java
View file @ a1f45599
package com.liquidnet.service.kylin.dto.param;
package com.liquidnet.service.kylin.dto.vo.partner;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import java.io.Serializable;
@Data
public class PerformanceCreateParam implements Serializable {
public class PerformancePartnerVo implements Serializable {
@ApiModelProperty(value = "演出id", example = "")
@JsonIgnore
......@@ -86,6 +85,15 @@ public class PerformanceCreateParam implements Serializable {
@ApiModelProperty(value = "是否售卖", example = "0")
private int statusSell;
@ApiModelProperty(value = "巡演id", example = "0",hidden = true)
private String roadShowId;
@ApiModelProperty(value = "搭售id", example = "0",hidden = true)
private String projectId;
@ApiModelProperty(value = "", example = "")
private String createdAt;
@ApiModelProperty(value = "是否保存", example = "")
private int isCreateSave;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketCreatePartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketPartnerVo.java
View file @ a1f45599
......@@ -12,7 +12,7 @@ import java.math.BigDecimal;
* 修改场地全部显示数据参数
*/
@Data
public class TicketCreatePartnerVo implements Serializable {
public class TicketPartnerVo implements Serializable {
@ApiModelProperty(value = "主键")
private String ticketsId;
......@@ -62,7 +62,7 @@ public class TicketCreatePartnerVo implements Serializable {
private String describes;
@ApiModelProperty(value = "票状态 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束", example = "0")
private int status;
private Integer status;
@ApiModelProperty(value = "是否展示二维码 0否 1是", example = "0")
private int isShowCode;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesCreatePartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesPartnerVo.java
View file @ a1f45599
......@@ -8,7 +8,7 @@ import java.io.Serializable;
//返回
@Data
public class TicketTimesCreatePartnerVo implements Serializable {
public class TicketTimesPartnerVo implements Serializable {
@ApiModelProperty(value = "主键id")
private String ticketTimesId;
......@@ -24,8 +24,8 @@ public class TicketTimesCreatePartnerVo implements Serializable {
@ApiModelProperty(value = "场次适用结束时间")
private String useEnd;
@ApiModelProperty(value = "状态 0不可见 1可见")
private int status;
@ApiModelProperty(value = "状态 -1新增 0不可见 1可见")
private Integer status;
@ApiModelProperty(value = "状态 1单日票 2通票")
private int type;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesTicketCreatePartnerVo.java
View file @ a1f45599
......@@ -39,5 +39,5 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
//票
@ApiModelProperty(value = "票数据")
private List<TicketCreatePartnerVo> ticket;
private List<TicketPartnerVo> ticket;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ a1f45599
......@@ -3,11 +3,11 @@ package com.liquidnet.service.kylin.service.admin;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
import com.liquidnet.service.kylin.entity.KylinPerformances;
import java.util.List;
......@@ -22,7 +22,11 @@ import java.util.List;
*/
public interface IKylinPerformancesAdminService extends IService<KylinPerformances> {
PerformanceCreatePartnerVo performanceDetails(String performancesId);
PerformanceMisVo performanceDetails(String performancesId);
PerformanceMisVo performanceCreateDetails(String performancesId);
PerformanceMisVo performanceUpdateDetails(String performancesId);
boolean performanceAudit(String performancesId,int status ,String rejectTxt);
......@@ -31,4 +35,10 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
List<PerformanceTitleDao> getListByRoadShowId(String roadShowId);
List<PerformanceTitleDao> getListByStatus(String status);
boolean changeRoadShowId(String performancesId,String roadShowId);
boolean setRecommend(List<PerformanceRecommendAdminParam> performancesId);
PageInfo<PerformanceRecommendAdminDao> listRecommend();
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java
View file @ a1f45599
......@@ -3,10 +3,8 @@ package com.liquidnet.service.kylin.service.partner;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
import com.liquidnet.service.kylin.entity.KylinPerformances;
/**
......@@ -19,17 +17,81 @@ import com.liquidnet.service.kylin.entity.KylinPerformances;
*/
public interface IKylinPerformancesPartnerService extends IService<KylinPerformances> {
/**
* 演出第一步
* @param step1Param
* @return
*/
String step1(PerformanceStep1Param step1Param);
/**
* 创建演出第一步
* @param step1Param
* @return
*/
String createStep1(PerformanceStep1Param step1Param);
boolean createStep2(PerformanceStep2Param step1Param);
/**
* 修改演出第一步
* @param step1Param
* @return
*/
String updateStep1(PerformanceStep1Param step1Param);
/**
* 获取演出第一步数据
* @param performancesId
* @return
*/
PerformancePartnerVo getStep1(String performancesId);
// /**
// * 获取创建演出第一步数据
// * @param performancesId
// * @return
// */
// PerformanceParam getCreateStep1(String performancesId);
//
// /**
// * 获取修改演出第一步数据
// * @param performancesId
// * @return
// */
// PerformanceParam getUpdateStep1(String performancesId);
PerformanceCreateParam getStep1(String performancesId);
/**
* 演出第二步
* @param step2Param
* @return
*/
boolean step2(PerformanceStep2Param step2Param);
/**
* 演出第二步创建
* @param step2Param
* @return
*/
boolean createStep2(PerformanceStep2Param step2Param);
/**
* 演出第二步修改
* @param step2Param
* @return
*/
boolean updateStep2(PerformanceStep2Param step2Param);
PerformanceStep2Param getStep2(String performancesId);
// PerformanceStep2Param getCreateStep2(String performancesId);
//
// PerformanceStep2Param getUpdateStep2(String performancesId);
boolean onLinePerformance(String performancesId);
boolean outLinePerformance(String performancesId);
String copyPerformance(String performancesId);
PageInfo<PerformancePartnerListDao> getList(PerformancePartnerListParam performancePartnerListParam);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketTimesPartnerService.java
View file @ a1f45599
......@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.service.partner;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import java.util.List;
......@@ -17,13 +17,38 @@ import java.util.List;
*/
public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTimes> {
TicketTimesCreatePartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam);
/**
* 创建场次汇总
* @param createTicketTimesParam
* @return
*/
TicketTimesPartnerVo createTimesSummary(CreateTicketTimesParam createTicketTimesParam);
/**
* 未通过审核创建场次
* @param createTicketTimesParam
* @return
*/
TicketTimesPartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam);
/**
* 通过审核后创建场次
* @param createTicketTimesParam
* @return
*/
TicketTimesPartnerVo addNewTimes(CreateTicketTimesParam createTicketTimesParam);
/**
* 删除 场次(只有未审核通过可删除)
* @param ticketTimesId
* @return
*/
Boolean deleteTimes(String ticketTimesId);
TicketTimesCreatePartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
TicketTimesPartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
List<TicketTimesCreatePartnerVo> getTimesMongoList(String performancesId);
List<TicketTimesPartnerVo> getTimesMongoList(String performancesId);
TicketTimesCreatePartnerVo getTimesMongo(String timesId);
TicketTimesPartnerVo getTimesMongo(String timesId);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketsPartnerService.java
View file @ a1f45599
......@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.service.partner;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTickets;
import java.util.List;
......@@ -17,17 +17,41 @@ import java.util.List;
*/
public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
TicketCreatePartnerVo createTicket(TicketCreateParam ticketCreateParam);
TicketCreatePartnerVo updateTicket(TicketCreateParam ticketCreateParam);
/**
* 创建票汇总
* @param ticketCreateParam
* @return
*/
TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam);
/**
* 未通过审核创建票
* @param ticketCreateParam
* @return
*/
TicketPartnerVo createTicket(TicketCreateParam ticketCreateParam);
/**
* 通过审核后创建场次
* @param ticketCreateParam
* @return
*/
TicketPartnerVo addNewTicket(TicketCreateParam ticketCreateParam);
TicketPartnerVo updateTicket(TicketCreateParam ticketCreateParam);
/**
* 删除 票(只有未审核通过可删除)
* @param ticketsId
* @return
*/
boolean deleteTicket(String ticketsId);
TicketCreatePartnerVo copyTicket(String ticketsId);
TicketPartnerVo copyTicket(String ticketsId);
boolean submitTicketByTimes(String timesId);
List<TicketCreatePartnerVo> getTicketMongoList(String timesId);
List<TicketPartnerVo> getTicketMongoList(String timesId);
TicketCreatePartnerVo getTicketsMongo(String ticketsId);
TicketPartnerVo getTicketsMongo(String ticketsId);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceRecommendAdminDao.java 0 → 100644
View file @ a1f45599
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 int status;
@ApiModelProperty(value = "排序位")
private int isRecommend;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
View file @ a1f45599
......@@ -42,7 +42,7 @@ public class KylinPerformanceStatus implements Serializable {
/**
* 状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退
*/
private int status;
private Integer status;
/**
* 是否售卖 0停止 1正常
......@@ -74,6 +74,10 @@ public class KylinPerformanceStatus implements Serializable {
*/
private Integer limitCount;
/**
* 推荐顺序 0不推荐
*/
private Integer isRecommend;
/**
* 创建时间
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformances.java
View file @ a1f45599
......@@ -35,7 +35,7 @@ public class KylinPerformances implements Serializable {
private String title;
/**
* 1音乐节 2演唱会 3小型演出 4展览 6舞台剧
* 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演
*/
private Integer type;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @ a1f45599
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.dao.FieldMisListDao;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -31,4 +28,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
//根据巡演查询 通过审核演出列表
List<PerformanceTitleDao> misTitleByStatusList(String status);
//推荐列表
List<PerformanceRecommendAdminDao> reCommendPerformanceList();
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ a1f45599
......@@ -40,11 +40,13 @@
<result column="title" property="title"/>
</resultMap>
<!-- 列表封装 -->
<sql id="partner_performance_list_Column">
</sql>
<resultMap id="PerformanceRecommendAdminDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao">
<result column="performances_id" property="performancesId"/>
<result column="title" property="title"/>
<result column="time_start" property="timeStart"/>
<result column="status" property="status"/>
<result column="is_recommend" property="isRecommend"/>
</resultMap>
<!-- 第三方演出列表 (不包含退票信息) -->
<select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
......@@ -112,7 +114,6 @@
</where>
ORDER BY #{orderItem} #{orderSc}
</select>
<!-- Mis演出列表 (不包含退票信息) -->
<select id="misPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
SELECT
......@@ -174,7 +175,7 @@
AND ps.STATUS = #{status}
</if>
<if test="status=='-2'">
AND ps.STATUS >= 3
AND ps.STATUS >= 3 or ps.STATUS = 1
</if>
<if test="auditStatus!='-2'">
AND ps.audit_status = #{auditStatus}
......@@ -188,7 +189,6 @@
</where>
ORDER BY #{orderItem} #{orderSc}
</select>
<!-- Mis 根据巡演查询演出列表 -->
<select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
SELECT performances_id,
......@@ -209,4 +209,17 @@
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
WHERE ps.status = ${roadShowId}
</select>
<!-- Mis演出推荐列表 -->
<select id="reCommendPerformanceList" resultMap="PerformanceRecommendAdminDaoResult">
SELECT performances_id,
title,
time_start,
status,
is_recommend
FROM kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
WHERE is_recommend > 0
ORDER BY is_recommend DESC
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ a1f45599
......@@ -158,6 +158,7 @@ CREATE TABLE `kylin_performance_status`
`audit_status` tinyint NOT NULL DEFAULT -1 COMMENT '-1未提交审核，0提交审核，1审核通过，2审核拒绝',
`is_true_name` tinyint NOT NULL DEFAULT 0 COMMENT '是否实名 0不需要 1需要',
`limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`is_recommend` tinyint(255) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performance_status_uid_index` (`performance_status_id`),
......@@ -279,7 +280,7 @@ CREATE TABLE `kylin_ticket_status`
`is_student` tinyint NOT NULL DEFAULT 0 COMMENT '是否学生票 0否 1是',
`is_electronic` tinyint NOT NULL DEFAULT 0 COMMENT '是否电子票 0否 1是',
`is_express` tinyint NOT NULL DEFAULT 0 COMMENT '是否快递票 0否 1是',
`status` tinyint NOT NULL DEFAULT 0 COMMENT '票状态 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束',
`status` tinyint NOT NULL DEFAULT 0 COMMENT '票状态 -2新建 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束',
`counts` int(11) NOT NULL DEFAULT 1 COMMENT '可验证次数',
`status_exchange` tinyint NOT NULL DEFAULT 0 COMMENT '兑换状态 6可兑换 7不可兑换',
`is_show_code` tinyint NOT NULL DEFAULT 0 COMMENT '是否显示二维码 0否 1是',
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java
View file @ a1f45599
......@@ -34,7 +34,7 @@ public class KylinBannersController {
private KylinBannersServiceImpl kylinBannersServiceImpl;
@GetMapping("")
@ApiOperation(value = "banner列表")
@ApiOperation("banner列表")
public ResponseDto<List<BannersVo>> blist(
@RequestParam(value = "position") String position,
@RequestParam(value = "provinceCode", defaultValue = "") String provinceCode
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @ a1f45599
package com.liquidnet.service.kylin.controller;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
/**
* <p>
* 演出 前端控制器
* </p>
*
* @author liquidnet
* @since 2021-05-05
* @author jiangxiulong
* @since 2021-05-11
*/
@Api(tags = "前端-演出")
@RestController
@RequestMapping("kylin/user/performance")
@RequestMapping("performance")
public class KylinPerformancesController {
@Autowired
private KylinPerformancesServiceImpl kylinPerformancesService;
@GetMapping("localList")
@ApiOperation("本地演出列表")
public ResponseDto<HashMap<String, Object>> localList(
@RequestParam(value = "sellTime", defaultValue = "") String sellTime, //开票时间
@RequestParam(value = "title", defaultValue = "") String title, //演出名称
@RequestParam(value = "cityId", defaultValue = "") String cityId, //省份id
@RequestParam(value = "type", defaultValue = "") Integer type, //演出类型
@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "size", defaultValue = "10") Integer size,
// 排序
@RequestParam(value = "SortType", defaultValue = "1") Integer SortType // 1时间正序 2时间倒序
) {
HashMap<String, Object> result = kylinPerformancesService.localList(sellTime, title, cityId, type, page, size, SortType);
if (result.size() > 0) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取本地演出列表失败");
}
}
@GetMapping("recommendList")
@ApiOperation("推荐演出列表")
public ResponseDto<List<PerformanceVo>> recommendList() {
List<PerformanceVo> result = kylinPerformancesService.recommendList();
if (result.size() > 0) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取演出列表失败");
}
}
@GetMapping("noticeList")
@ApiOperation("演出预告列表")
public ResponseDto<List<PerformanceVo>> noticeList() {
List<PerformanceVo> result = kylinPerformancesService.noticeList();
if (result.size() > 0) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取演出列表失败");
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinBannersAdminController.java
View file @ a1f45599
......@@ -10,12 +10,10 @@ import com.liquidnet.service.kylin.entity.KylinBanners;
import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.bytebuddy.implementation.bytecode.constant.DefaultValue;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.groups.Default;
import java.util.List;
/**
......@@ -36,7 +34,7 @@ public class KylinBannersAdminController {
private KylinBannersServiceImpl kylinBannersServiceImpl;
@PostMapping("")
@ApiOperation(value = "创建banner")
@ApiOperation("创建banner")
public ResponseDto<Object> create(@RequestBody @Validated BannersParam bannersParam) {
Boolean res = kylinBannersServiceImpl.create(bannersParam);
if (res) {
......@@ -47,7 +45,7 @@ public class KylinBannersAdminController {
}
@PutMapping("")
@ApiOperation(value = "修改banner")
@ApiOperation("修改banner")
public ResponseDto<Object> update(@RequestBody BannersParam bannersParam) {
boolean res = kylinBannersServiceImpl.update(bannersParam);
if (res) {
......@@ -58,7 +56,7 @@ public class KylinBannersAdminController {
}
@GetMapping("{bannersId}")
@ApiOperation(value = "banner详情")
@ApiOperation("banner详情")
public ResponseDto<KylinBanners> detail(@PathVariable("bannersId") String bannersId) {
KylinBanners result = null;
result = kylinBannersServiceImpl.detail(bannersId);
......@@ -70,7 +68,7 @@ public class KylinBannersAdminController {
}
@GetMapping("list")
@ApiOperation(value = "banner列表")
@ApiOperation("banner列表")
public ResponseDto<PagerVo<BannerDetailsListDao>> bannerList(
@RequestParam(value = "bannersName", defaultValue = "") String bannersName,
@RequestParam(value = "isOnline", defaultValue = "1") Integer isOnline,
......@@ -99,7 +97,7 @@ public class KylinBannersAdminController {
}
@DeleteMapping("{bannersId}")
@ApiOperation(value = "删除banner")
@ApiOperation("删除banner")
public ResponseDto<Object> delete(@PathVariable("bannersId") String bannersId) {
boolean result = kylinBannersServiceImpl.delete(bannersId);
if (result) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java
View file @ a1f45599
......@@ -4,11 +4,11 @@ package com.liquidnet.service.kylin.controller.admin;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
import com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
......@@ -37,7 +38,7 @@ public class KylinPerformancesAdminController {
@PostMapping(value = "list")
@ApiOperation(value = "获取列表")
@ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformanceAdminListDao>> performanceDetails(@RequestBody PerformanceAdminListParam performanceAdminListParam) {
public ResponseDto<PageInfo<PerformanceAdminListDao>> getList(@RequestBody @Valid PerformanceAdminListParam performanceAdminListParam) {
PageInfo<PerformanceAdminListDao> result = null;
result = performancesAdminService.getList(performanceAdminListParam);
if (null != result) {
......@@ -49,9 +50,9 @@ public class KylinPerformancesAdminController {
@GetMapping(value = "details")
@ApiOperation(value = "获取演出详情")
@ApiResponse(response = PerformanceCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceCreatePartnerVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
PerformanceCreatePartnerVo result = null;
@ApiResponse(response = PerformanceMisVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceMisVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
PerformanceMisVo result = null;
result = performancesAdminService.performanceDetails(performancesId);
if (null != result) {
return ResponseDto.success(result);
......@@ -60,10 +61,10 @@ public class KylinPerformancesAdminController {
}
}
@GetMapping(value = "audit")
@PostMapping(value = "audit")
@ApiOperation(value = "演出审核")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> performanceDetails(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam("rejectTxt") String rejectTxt) {
public ResponseDto<String> performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
boolean result = performancesAdminService.performanceAudit(performancesId, status, rejectTxt);
if (result) {
return ResponseDto.success("审核完成");
......@@ -85,7 +86,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "list/status")
@ApiOperation(value = "列表根据巡演id")
@ApiOperation(value = "列表根据演出状态")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<List<PerformanceTitleDao>> getListByStatus(@RequestParam("status") String status) {
List<PerformanceTitleDao> result = performancesAdminService.getListByStatus(status);
......@@ -96,4 +97,39 @@ public class KylinPerformancesAdminController {
}
}
@GetMapping(value = "roadShow/relation")
@ApiOperation(value = "修改演出巡演关联")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> changeRoadShowId(@RequestParam("performanceId") String performanceId, @RequestParam("roadShowId") String roadShowId) {
boolean result = performancesAdminService.changeRoadShowId(performanceId, roadShowId);
if (result) {
return ResponseDto.success("操作成功");
} else {
return ResponseDto.failure("操作失败");
}
}
@PutMapping(value = "performance/recommend")
@ApiOperation(value = "演出推荐编辑")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> setRecommend(@RequestBody @Valid List<PerformanceRecommendAdminParam> performanceRecommendAdminParam) {
boolean result = performancesAdminService.setRecommend(performanceRecommendAdminParam);
if (result) {
return ResponseDto.success("操作成功");
} else {
return ResponseDto.failure("操作失败");
}
}
@GetMapping(value = "performance/recommend/list")
@ApiOperation(value = "演出推荐列表")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformanceRecommendAdminDao>> listRecommend() {
PageInfo<PerformanceRecommendAdminDao> result = performancesAdminService.listRecommend();
if (result != null) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取失败");
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinRoadShowsAdminController.java
View file @ a1f45599
......@@ -17,6 +17,9 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
/**
* <p>
* 巡演 前端控制器
......@@ -36,7 +39,9 @@ public class KylinRoadShowsAdminController {
@GetMapping(value = "list")
@ApiOperation(value = "获取列表")
@ApiResponse(response = RoadShowAdminListDao.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<RoadShowAdminListDao>> performanceDetails(@RequestParam("title") String title, int page, int size) {
public ResponseDto<PageInfo<RoadShowAdminListDao>> listRoadShow(@RequestParam(value = "title",required = false) String title,
@RequestParam(value = "page") int page,
@RequestParam(value = "size") int size) {
PageInfo<RoadShowAdminListDao> result = null;
result = roadShowsService.listRoadShow(title, page, size);
if (null != result) {
......@@ -49,10 +54,12 @@ public class KylinRoadShowsAdminController {
@PostMapping(value = "")
@ApiOperation(value = "创建")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
public ResponseDto<Map<String,String>> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
String result = roadShowsService.createRoadShow(createRoadShowParam);
if (!result.isEmpty()) {
return ResponseDto.success(result);
Map<String,String> map = new HashMap<>();
map.put("roadShowId",result);
return ResponseDto.success(map);
} else {
return ResponseDto.failure("创建失败");
}
......@@ -72,7 +79,7 @@ public class KylinRoadShowsAdminController {
@DeleteMapping(value = "")
@ApiOperation(value = "删除")
@ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
@ApiResponse( code = 200, message = "接口返回对象参数")
public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
if (result) {
......@@ -84,7 +91,7 @@ public class KylinRoadShowsAdminController {
@GetMapping(value = "details")
@ApiOperation(value = "详情")
@ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
@ApiResponse(response = RoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
RoadShowAdminVo result = null;
result = roadShowsService.detailsRoadShow(roadShowId);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketTimesPartnerController.java
View file @ a1f45599
......@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -29,10 +29,10 @@ public class KylinTicketTimesPartnerController {
@PostMapping(value = "")
@ApiOperation(value = "创建场次")
@ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesCreatePartnerVo> createTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
TicketTimesCreatePartnerVo result = null;
result = ticketTimesPartnerService.createTimes(createTicketTimesParam);
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesPartnerVo> createTimesSummary(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
TicketTimesPartnerVo result = null;
result = ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
if (null == result) {
return ResponseDto.failure("创建失败");
} else {
......@@ -42,7 +42,7 @@ public class KylinTicketTimesPartnerController {
@DeleteMapping(value = "")
@ApiOperation(value = "删除场次")
@ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
boolean result = ticketTimesPartnerService.deleteTimes(ticketTimesId);
if (result) {
......@@ -54,9 +54,9 @@ public class KylinTicketTimesPartnerController {
@PutMapping(value = "")
@ApiOperation(value = "修改场次")
@ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesCreatePartnerVo> deleteTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
TicketTimesCreatePartnerVo result = null;
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesPartnerVo> changeTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
TicketTimesPartnerVo result = null;
result = ticketTimesPartnerService.changeTimes(createTicketTimesParam);
if (null == result) {
return ResponseDto.failure("修改失败");
......@@ -67,9 +67,9 @@ public class KylinTicketTimesPartnerController {
@GetMapping(value = "/details")
@ApiOperation(value = "获取场次详情")
@ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesCreatePartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
TicketTimesCreatePartnerVo result = null;
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
TicketTimesPartnerVo result = null;
result = ticketTimesPartnerService.getTimesMongo(ticketTimesId);
if (null == result) {
return ResponseDto.failure("查询场次信息失败");
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java
View file @ a1f45599
......@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -29,10 +29,10 @@ public class KylinTicketsPartnerController {
@PostMapping(value = "")
@ApiOperation(value = "创建票务")
@ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketCreatePartnerVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
TicketCreatePartnerVo result = null;
result = ticketsPartnerService.createTicket(ticketCreateParam);
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> createTicketSummary(@RequestBody TicketCreateParam ticketCreateParam) {
TicketPartnerVo result = null;
result = ticketsPartnerService.createTicketSummary(ticketCreateParam);
if (null == result) {
return ResponseDto.failure("创建票务失败");
} else {
......@@ -42,9 +42,9 @@ public class KylinTicketsPartnerController {
@PutMapping(value = "")
@ApiOperation(value = "修改票务")
@ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketCreatePartnerVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
TicketCreatePartnerVo result = null;
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
TicketPartnerVo result = null;
result = ticketsPartnerService.updateTicket(ticketCreateParam);
if (null == result) {
return ResponseDto.failure("修改票务失败");
......@@ -67,9 +67,9 @@ public class KylinTicketsPartnerController {
@PostMapping(value = "/copy")
@ApiOperation(value = "复制票务")
@ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketCreatePartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
TicketCreatePartnerVo result = null;
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
TicketPartnerVo result = null;
result = ticketsPartnerService.copyTicket(ticketsId);
if (null == result) {
return ResponseDto.failure("复制票务失败");
......@@ -80,9 +80,9 @@ public class KylinTicketsPartnerController {
@GetMapping(value = "/details")
@ApiOperation(value = "获取票务详情")
@ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketCreatePartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
TicketCreatePartnerVo result = null;
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
TicketPartnerVo result = null;
result = ticketsPartnerService.getTicketsMongo(ticketsId);
if (null == result) {
return ResponseDto.failure("查询票务信息失败");
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java
View file @ a1f45599
......@@ -3,10 +3,8 @@ package com.liquidnet.service.kylin.controller.partner;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -14,6 +12,9 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
@Api(tags = "第三方-演出")
@RestController
@RequestMapping("partner/performance")
......@@ -35,46 +36,64 @@ public class PerformancePartnerController {
}
}
@PostMapping(value = "step1")
@ApiOperation(value = "创建演出第一步")
@PostMapping(value = "copy")
@ApiOperation(value = "复制演出")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> createStep1(@RequestBody PerformanceStep1Param performanceStep1Param) {
String result = performancesPartnerService.createStep1(performanceStep1Param);
if (result.isEmpty()) {
return ResponseDto.failure("创建失败");
public ResponseDto<Map<String,String>> copyPerformance(@RequestParam("performancesId") String performancesId) {
String result = performancesPartnerService.copyPerformance(performancesId);
if (null == result) {
return ResponseDto.failure("复制失败");
} else {
Map<String,String> map = new HashMap<>();
map.put("performancesId",result);
return ResponseDto.success(map);
}
}
@GetMapping(value = "step1")
@ApiOperation(value = "获取演出第一步数据")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformancePartnerVo> getStep1(@RequestParam("performancesId") String performancesId) {
PerformancePartnerVo result = performancesPartnerService.getStep1(performancesId);
if (result == null) {
return ResponseDto.failure("获取数据失败");
} else {
return ResponseDto.success(result);
}
}
@PostMapping(value = "step2")
@ApiOperation(value = "创建演出第二步")
@PostMapping(value = "step1")
@ApiOperation(value = "操作演出第一步")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> createStep2(@RequestBody PerformanceStep2Param performanceStep2Param) {
boolean result = performancesPartnerService.createStep2(performanceStep2Param);
if (!result) {
return ResponseDto.failure("提交失败");
public ResponseDto<Map<String,String>> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
String result = performancesPartnerService.step1(performanceStep1Param);
if (result.isEmpty()) {
return ResponseDto.failure("操作失败");
} else {
return ResponseDto.success("提交完成");
Map<String,String> map = new HashMap<>();
map.put("performancesId",result);
return ResponseDto.success(map);
}
}
@GetMapping(value = "step1")
@ApiOperation(value = "获取演出第一步数据")
@PostMapping(value = "step2")
@ApiOperation(value = "操作演出第二步")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceCreateParam> createStep1(@RequestParam("performancesId") String performancesId) {
PerformanceCreateParam result = performancesPartnerService.getStep1(performancesId);
if (result==null) {
return ResponseDto.failure("获取数据失败");
public ResponseDto<String> step2(@RequestBody PerformanceStep2Param performanceStep2Param) {
boolean result = performancesPartnerService.step2(performanceStep2Param);
if (!result) {
return ResponseDto.failure("提交失败");
} else {
return ResponseDto.success(result);
return ResponseDto.success("提交完成");
}
}
@GetMapping(value = "step2")
@ApiOperation(value = "获取演出第二步数据")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceStep2Param> createStep2(@RequestParam("performancesId") String performancesId) {
public ResponseDto<PerformanceStep2Param> getStep2(@RequestParam("performancesId") String performancesId) {
PerformanceStep2Param result = performancesPartnerService.getStep2(performancesId);
if (result == null) {
return ResponseDto.failure("获取数据失败");
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ a1f45599
package com.liquidnet.service.kylin.service.impl;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import com.liquidnet.service.kylin.service.IKylinPerformancesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.BasicQuery;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.regex.Pattern;
/**
* <p>
* 演出 服务实现类
* 前端 演出 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-05
* @author jiangxiulong
* @since 2021-05-11
*/
@Service
public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesService {
@Autowired
private MongoTemplate mongoTemplate;
public HashMap<String, Object> localList(String sellTime, String title, String cityId, Integer type, Integer page, Integer size, Integer SortType) {
HashMap<String,Object> info = new HashMap<>();
// 排序 分页
Sort sortName = null; // 默认开票越早的在上面
if (SortType != null) {
switch (SortType) {
case 1:
sortName = Sort.by(Sort.Direction.ASC, "sellTime");
break;
case 2:
sortName = Sort.by(Sort.Direction.DESC, "sellTime");
break;
default:
sortName = Sort.by(Sort.Direction.ASC, "sellTime");
break;
}
}
Pageable pageable = PageRequest.of(page - 1, size, sortName);
//条件
Document queryObject = new Document();
if (!title.isEmpty()) {
queryObject.put("title", Pattern.compile(title, Pattern.CASE_INSENSITIVE));
}
if (!cityId.isEmpty()) {
queryObject.put("cityId", cityId);
}
if (type != null) {
queryObject.put("type", type);
}
Query query = new BasicQuery(queryObject);
if (!sellTime.isEmpty()) {
String sellTimeEnd = sellTime + " 23:59:59";
query.addCriteria(Criteria.where("sellTime").gte(sellTime).lte(sellTimeEnd));
}
// 固定查询条件
LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
query.addCriteria(Criteria.where("stopSellTime").gte(nowTimeStr));
query.addCriteria(Criteria.where("statusSell").is(1));
// 要查询的字段
/*Document fieldsObject = new Document();
Query query = new BasicQuery(queryObject, fieldsObject);
fieldsObject.put("performancesId", true);*/
// 查询总数
long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
query.with(pageable);
List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
// 组合数据
info.put("total",count);
info.put("data", list);
return info;
}
public List<PerformanceVo> recommendList() {
// 固定查询条件
LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
Query query = Query.query(
Criteria.where("stopSellTime").gte(nowTimeStr).and("statusSell").is(1)
);
List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
return list;
}
public List<PerformanceVo> noticeList() {
// 固定查询条件
LocalDateTime nowTime = LocalDateTime.now();
LocalDateTime threeDaysLater = nowTime.plusDays(3);
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String threeDaysLaterStr = threeDaysLater.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
Query query = Query.query(
Criteria.where("sellTime").gte(nowTimeStr).lt(threeDaysLaterStr).and("statusSell").is(1)
);
List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
return list;
}
}
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