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

Commit fbeb20f2 authored by 胡佳晨's avatar 胡佳晨

添加 错误码

parent 52c57d1a
......@@ -28,8 +28,8 @@ public class BannersSearchParam implements Serializable {
private Integer promotionType;
@ApiModelProperty(value = "页数 ", example = "1")
private int page;
private Integer page;
@ApiModelProperty(value = "数量 ", example = "10")
private int size;
private Integer size;
}
......@@ -32,7 +32,7 @@ public class CreateTicketTimesParam implements Serializable {
@ApiModelProperty(value = "类型 1单日票 2通票", example = "1")
@NotNull(message = "不能为空")
private int type;
private Integer type;
@ApiModelProperty(value = "", example = "")
@JsonIgnore
......
......@@ -22,10 +22,10 @@ public class FieldsAuditParam implements Serializable {
private String fieldsId;
@ApiModelProperty(value = "认证状态 1已认证 2被拒绝", example = "1")
private int validStatus;
private Integer validStatus;
@ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝", example = "0",hidden = true)
private int changeStatus;
private Integer changeStatus;
@ApiModelProperty(value = "拒绝理由", example = "")
private String refuseMessage;
......
......@@ -55,13 +55,13 @@ public class FieldsParam implements Serializable {
private String provinceName;
@ApiModelProperty(value = "城市id", example = "1")
private int cityId;
private Integer cityId;
@ApiModelProperty(value = "城市名称", example = "北京")
private String cityName;
@ApiModelProperty(value = "县id", example = "1")
private int districtId;
private Integer districtId;
@ApiModelProperty(value = "县名称", example = "朝阳区")
private String districtName;
......
......@@ -31,32 +31,32 @@ public class FieldsSearchParam implements Serializable {
private String districtName;
@ApiModelProperty(value = "认证状态 -1全部 0未认证 1已认证", example = "-1")
private int validStatus;
private Integer validStatus;
@ApiModelProperty(value = "是否显示 -1全部 0不显示 1显示", example = "-1")
private int isDisplay;
private Integer isDisplay;
@ApiModelProperty(value = "是否营业 -1全部 0不营业 1营业中", example = "-1")
private int isBusiness;
private Integer isBusiness;
@ApiModelProperty(value = "审核状态 -1全部 0待审核 1已审核 2被拒绝", example = "-1")
private int changeStatus;
private Integer changeStatus;
@ApiModelProperty(value = "排序类型 1创建时间 1修改时间 ", example = "1")
private int orderType;
private Integer orderType;
@ApiModelProperty(value = "页数 ", example = "1")
private int page;
private Integer page;
@ApiModelProperty(value = "数量 ", example = "10")
private int size;
private Integer size;
@JsonIgnore
private int provinceId;
private Integer provinceId;
@JsonIgnore
private int cityId;
private Integer cityId;
@JsonIgnore
private int districtId;
private Integer districtId;
}
......@@ -17,10 +17,10 @@ public class FieldsStatusParam implements Serializable {
private String fieldsId;
@ApiModelProperty(value = "是否显示 0不显示 1显示", example = "1")
private int isDisplay;
private Integer isDisplay;
@ApiModelProperty(value = "是否营业 0不营业 1营业中", example = "1")
private int isBusiness;
private Integer isBusiness;
@ApiModelProperty(example = "", hidden = true)
private String updatedAt;
......
......@@ -13,22 +13,22 @@ public class PerformanceAdminListParam {
private String title;
@ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
@NotNull(message = "不能为空")
private int status;
private Integer status;
@ApiModelProperty(value = "城市名称", example = "")
private String cityName;
@ApiModelProperty(value = "-2全部,0审核中,2审核拒绝", example = "0")
@NotNull(message = "不能为空")
private int auditStatus;
private Integer auditStatus;
@ApiModelProperty(value = "停售时间(天)-2全部", example = "-2")
private long stopSellDay;
@ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00",hidden = true)
private String stopSellTime;
@ApiModelProperty(value = "页数", example = "0")
@NotNull(message = "不能为空")
private int page;
private Integer page;
@ApiModelProperty(value = "数量", example = "20")
@NotNull(message = "不能为空")
private int size;
private Integer size;
@ApiModelProperty(value = "排序字段", hidden = true)
private String orderItem;
@ApiModelProperty(value = "排序方式", hidden = true)
......
......@@ -14,13 +14,13 @@ public class PerformanceMemberAuditParam {
@ApiModelProperty(value = "演出名称")
private String title;
@ApiModelProperty(value = "是否会员")
private int isMember;
private Integer isMember;
@ApiModelProperty(value = "是否专属")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "0未提交 1待审核 2已拒绝 3已通过")
private int status;
private Integer status;
@ApiModelProperty(value = "拒绝理由")
private int rejectTxt;
private String rejectTxt;
@ApiModelProperty("修改时间")
private String updatedAt;
@ApiModelProperty(value = "票种列表")
......
......@@ -13,33 +13,33 @@ public class PerformancePartnerListParam {
private String title;
@ApiModelProperty(value = "-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;", example = "0")
@NotNull(message = "不能为空")
private int status;
private Integer status;
@ApiModelProperty(value = "-2全部,-1未提交审核,0审核中,1审核通过,2审核拒绝", example = "0")
@NotNull(message = "不能为空")
private int auditStatus;
private Integer auditStatus;
@ApiModelProperty(value = "演出开始时间", example = "2000-01-01 12:00:00")
private String timeStart;
@ApiModelProperty(value = "演出结束时间", example = "2000-01-01 12:00:00")
private String timeEnd;
@ApiModelProperty(value = "排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序", example = "0")
@NotNull(message = "不能为空")
private int orderType;
private Integer orderType;
@ApiModelProperty(value = "停售时间(单位天 -2全部)", example = "-2")
private long stopSellDay;
@ApiModelProperty(value = "停售时间(单位天 -2全部)", example = "-2", hidden = true)
private String stopSellTime;
@ApiModelProperty(value = "页数", example = "0")
@NotNull(message = "不能为空")
private int page;
private Integer page;
@ApiModelProperty(value = "数量", example = "20")
@NotNull(message = "不能为空")
private int size;
private Integer size;
@ApiModelProperty(value = "排序字段", hidden = true)
private String orderItem;
@ApiModelProperty(value = "排序方式", hidden = true)
private String orderSc;
public void setOrderType(int orderType) {
public void setOrderType(Integer orderType) {
this.orderType = orderType;
switch (orderType) {
case 1: {
......
......@@ -23,7 +23,7 @@ public class PerformancePartnerVo implements Serializable {
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
private int type;
private Integer type;
@ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
private String timeStart;
......@@ -62,22 +62,22 @@ public class PerformancePartnerVo implements Serializable {
private String approvalUrl;
@ApiModelProperty(value = "待支付时间", example = "5")
private int payCountdownMinute;
private Integer payCountdownMinute;
@ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
private String noticeImage;
@ApiModelProperty(value = "是否实名", example = "0")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购数量 0为不限购", example = "0")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
private int isSubmit;
private Integer isSubmit;
@ApiModelProperty(value = "状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "0")
private int status;
private Integer status;
@ApiModelProperty(value = "第三方id", example = "0")
private String merchantId;
......@@ -86,7 +86,7 @@ public class PerformancePartnerVo implements Serializable {
private String describes;
@ApiModelProperty(value = "是否售卖", example = "0")
private int statusSell;
private Integer statusSell;
@ApiModelProperty(value = "巡演id", example = "0",hidden = true)
private String roadShowId;
......
......@@ -11,5 +11,5 @@ public class PerformanceRecommendAdminParam {
@ApiModelProperty(value = "演出id")
private String performanceId;
@ApiModelProperty(value = "推荐位")
private int isRecommend;
private Integer isRecommend;
}
......@@ -28,7 +28,7 @@ public class PerformanceStep1Param implements Serializable {
@ApiModelProperty(value = "1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演", example = "3")
@NotNull(message = "不能为空")
private int type;
private Integer type;
@ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
@NotNull(message = "不能为空")
......@@ -76,7 +76,7 @@ public class PerformanceStep1Param implements Serializable {
@ApiModelProperty(value = "待支付时间", example = "5")
@NotNull(message = "不能为空")
private int payCountdownMinute;
private Integer payCountdownMinute;
@ApiModelProperty(value = "购票须知",hidden = true,example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
private String noticeImage;
......
......@@ -18,15 +18,15 @@ public class PerformanceStep2Param implements Serializable {
@ApiModelProperty(value = "是否实名", example = "0")
@NotNull(message = "不能为空")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购数量 0为不限购", example = "0")
@NotNull(message = "不能为空")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
@NotNull(message = "不能为空")
private int isSubmit;
private Integer isSubmit;
@ApiModelProperty(value = "场次数据",hidden = true)
private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
......
......@@ -35,15 +35,15 @@ public class TicketCreateParam implements Serializable {
@ApiModelProperty(value = "是否学生票 0否 1是", example = "0")
@NotNull(message = "不能为空")
private int isStudent;
private Integer isStudent;
@ApiModelProperty(value = "是否电子票", example = "0")
@NotNull(message = "不能为空")
private int isElectronic;
private Integer isElectronic;
@ApiModelProperty(value = "是否快递票", example = "0")
@NotNull(message = "不能为空")
private int isExpress;
private Integer isExpress;
@ApiModelProperty(value = "价格", example = "100.00")
@NotNull(message = "不能为空")
......@@ -54,15 +54,15 @@ public class TicketCreateParam implements Serializable {
@ApiModelProperty(value = "总库存", example = "100")
@NotNull(message = "不能为空")
private int totalGeneral;
private Integer totalGeneral;
@ApiModelProperty(value = "总兑换库存", example = "100")
@NotNull(message = "不能为空")
private int totalExchange;
private Integer totalExchange;
@ApiModelProperty(value = "限购数量", example = "0")
@NotNull(message = "不能为空")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
@NotNull(message = "不能为空")
......@@ -76,18 +76,18 @@ public class TicketCreateParam implements Serializable {
private String describes;
@ApiModelProperty(value = "是否展示二维码 0否 1是", example = "0")
private int isShowCode;
private Integer isShowCode;
@ApiModelProperty(value = "二维码显示时间", example = "2020-12-01T14:00:00")
private LocalDateTime qrCodeShowTime;
@ApiModelProperty(value = "次数", example = "1")
@NotNull(message = "不能为空")
private int counts;
private Integer counts;
@ApiModelProperty(value = "是否开启缺票登记", example = "1")
@NotNull(message = "不能为空")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "", hidden = true)
private String createdAt;
......
......@@ -16,7 +16,7 @@ public class TicketMemberAuditParam {
@ApiModelProperty(value = "会员优惠价格")
private BigDecimal priceDiscountMember;
@ApiModelProperty(value = "会员优惠时间段限购数量")
private int memberLimitCount;
private Integer memberLimitCount;
@ApiModelProperty(value = "会员提前开售分钟")
private int advanceMinuteMember;
private Integer advanceMinuteMember;
}
......@@ -62,16 +62,16 @@ public class FieldsMisDetailsVo implements Serializable {
private String districtName;
@ApiModelProperty(value = "认证状态 0未认证 1已认证")
private int validStatus;
private Integer validStatus;
@ApiModelProperty(value = "是否显示 0不显示 1显示")
private int isDisplay;
private Integer isDisplay;
@ApiModelProperty(value = "是否营业 0不营业 1营业中")
private int isBusiness;
private Integer isBusiness;
@ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
private int changeStatus;
private Integer changeStatus;
@ApiModelProperty(value = "创建时间")
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
......
......@@ -39,16 +39,16 @@ public class FieldsMisListVo implements Serializable {
private String districtName;
@ApiModelProperty(value = "认证状态 0未认证 1已认证")
private int validStatus;
private Integer validStatus;
@ApiModelProperty(value = "是否显示 0不显示 1显示")
private int isDisplay;
private Integer isDisplay;
@ApiModelProperty(value = "是否营业 0不营业 1营业中")
private int isBusiness;
private Integer isBusiness;
@ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
private int changeStatus;
private Integer changeStatus;
@ApiModelProperty(value = "创建时间")
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
......
......@@ -48,19 +48,19 @@ public class FieldsVo implements Serializable {
private String description;
@ApiModelProperty(value = "省id")
private int provinceId;
private Integer provinceId;
@ApiModelProperty(value = "省名称")
private String provinceName;
@ApiModelProperty(value = "城市id")
private int cityId;
private Integer cityId;
@ApiModelProperty(value = "城市名称")
private String cityName;
@ApiModelProperty(value = "县id")
private int districtId;
private Integer districtId;
@ApiModelProperty(value = "县名称")
private String districtName;
......@@ -69,16 +69,16 @@ public class FieldsVo implements Serializable {
private String refuseMessage;
@ApiModelProperty(value = "认证状态 0未认证 1已认证")
private int validStatus;
private Integer validStatus;
@ApiModelProperty(value = "是否显示 0不显示 1显示")
private int isDisplay;
private Integer isDisplay;
@ApiModelProperty(value = "是否营业 0不营业 1营业中")
private int isBusiness;
private Integer isBusiness;
@ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
private int changeStatus;
private Integer changeStatus;
@ApiModelProperty(value = "补充字段")
private String comment;
......
......@@ -60,27 +60,27 @@ public class PerformanceVo {
// private String noticeImage;
@ApiModelProperty(value = "推荐顺序 0为不推荐")
private int isRecommend;
private Integer isRecommend;
@ApiModelProperty(value = "状态")
private int appStatus;
private Integer appStatus;
@ApiModelProperty(value = "是否可买")
private int statusSell;
private Integer statusSell;
@ApiModelProperty(value = "是否关联会员")
private int isMember;
private Integer isMember;
@ApiModelProperty(value = "是否开启缺票登记")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否专属")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "是否优惠")
private int isDiscount;
private Integer isDiscount;
@ApiModelProperty(value = "是否提前")
private int isAdvance;
private Integer isAdvance;
@ApiModelProperty(value = "文案")
private String message;
......
......@@ -17,7 +17,7 @@ public class TicketTimesVo {
@ApiModelProperty(value = "名称")
private String title;
@ApiModelProperty(value = "类型 1单日 2通票")
private int type;
private Integer type;
@ApiModelProperty(value = "演出id")
private String performanceId;
@ApiModelProperty(value = "场次id")
......
......@@ -21,7 +21,7 @@ public class TicketVo {
@ApiModelProperty(value = "名称")
private String title;
@ApiModelProperty(value = "类型 1单日 2通票")
private int type;
private Integer type;
@ApiModelProperty(value = "价格")
private BigDecimal price;
@ApiModelProperty(value = "快递费")
......@@ -49,33 +49,33 @@ public class TicketVo {
@ApiModelProperty(value = "适用结束时间")
private String useEnd;
@ApiModelProperty(value = "开票倒计时(分钟数)")
private int saleRemindMinute;
private Integer saleRemindMinute;
@ApiModelProperty(value = "是否学生票")
private int isStudent;
private Integer isStudent;
@ApiModelProperty(value = "是否电子票")
private int isElectronic;
private Integer isElectronic;
@ApiModelProperty(value = "是否快递票")
private int isExpress;
private Integer isExpress;
@ApiModelProperty(value = "可验证次数")
private Integer counts;
@ApiModelProperty(value = "状态")
private int status;
private Integer status;
@ApiModelProperty(value = "兑换状态")
private int statusExchange;
private Integer statusExchange;
@ApiModelProperty(value = "是否缺票登记")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "快递状态 1寄付 2到付")
private int expressType;
private Integer expressType;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否会员专属")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "是否会员")
private int isMember;
private Integer isMember;
public void setTicket(KylinTickets ticket) {
this.ticketsId = ticket.getTicketsId();
......
......@@ -9,9 +9,9 @@ import lombok.Data;
public class PerformanceMemberHistoryVo {
@ApiModelProperty(value = "0未提交 1待审核 2已拒绝 3已通过")
private int status;
private Integer status;
@ApiModelProperty(value = "审核时间")
private String auditTime;
@ApiModelProperty(value = "拒绝理由")
private int rejectTxt;
private Integer rejectTxt;
}
......@@ -13,5 +13,5 @@ public class RoadShowAdminVo {
@ApiModelProperty(value = "标题")
private String title;
@ApiModelProperty(value = "状态")
private int status;
private Integer status;
}
......@@ -20,7 +20,7 @@ public class PerformanceIgnoreVo {
@ApiModelProperty(value = "演出图片")
private String imgPoster;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private int type;
private Integer type;
@ApiModelProperty(value = "演出开始时间")
private String timeStart;
@ApiModelProperty(value = "演出结束时间")
......@@ -56,27 +56,27 @@ public class PerformanceIgnoreVo {
// private String noticeImage;
@ApiModelProperty(value = "推荐顺序 0为不推荐")
private int isRecommend;
private Integer isRecommend;
@ApiModelProperty(value = "状态")
private int appStatus;
private Integer appStatus;
@ApiModelProperty(value = "是否可买")
private int statusSell;
private Integer statusSell;
@ApiModelProperty(value = "是否关联会员")
private int isMember;
private Integer isMember;
@ApiModelProperty(value = "是否开启缺票登记")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
@ApiModelProperty(value = "是否专属")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "是否优惠")
private int isDiscount;
private Integer isDiscount;
@ApiModelProperty(value = "是否提前")
private int isAdvance;
private Integer isAdvance;
@ApiModelProperty(value = "文案")
private String message;
......
......@@ -18,7 +18,7 @@ public class TicketIgnoreVo {
@ApiModelProperty(value = "名称")
private String title;
@ApiModelProperty(value = "类型 1单日 2通票")
private int type;
private Integer type;
@ApiModelProperty(value = "价格")
private BigDecimal price;
@ApiModelProperty(value = "快递费")
......@@ -46,29 +46,29 @@ public class TicketIgnoreVo {
@ApiModelProperty(value = "适用结束时间")
private String useEnd;
@ApiModelProperty(value = "开票倒计时(分钟数)")
private int saleRemindMinute;
private Integer saleRemindMinute;
@ApiModelProperty(value = "是否学生票")
private int isStudent;
private Integer isStudent;
@ApiModelProperty(value = "是否电子票")
private int isElectronic;
private Integer isElectronic;
@ApiModelProperty(value = "是否快递票")
private int isExpress;
private Integer isExpress;
@ApiModelProperty(value = "状态")
private int status;
private Integer status;
@ApiModelProperty(value = "兑换状态")
private int statusExchange;
private Integer statusExchange;
@ApiModelProperty(value = "是否缺票登记")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "快递状态 1寄付 2到付")
private int expressType;
private Integer expressType;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "是否会员专属")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "是否会员")
private int isMember;
private Integer isMember;
public void setTicket(KylinTickets ticket) {
this.ticketsId = ticket.getTicketsId();
......
......@@ -14,7 +14,7 @@ public class TicketTimesIgnoreVo {
@ApiModelProperty(value = "名称")
private String title;
@ApiModelProperty(value = "类型 1单日 2通票")
private int type;
private Integer type;
@ApiModelProperty(value = "演出id")
private String performanceId;
@ApiModelProperty(value = "场次id")
......
......@@ -25,7 +25,7 @@ public class PerformanceMisVo {
private String imgPoster;
@ApiModelProperty(value = "类型")
private int type;
private Integer type;
@ApiModelProperty(value = "场地id")
private String fieldId;
......@@ -58,31 +58,31 @@ public class PerformanceMisVo {
private String noticeImage;
@ApiModelProperty(value = "状态")
private int status;
private Integer status;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt;
@ApiModelProperty(value = "是否展示")
private int isShow;
private Integer isShow;
@ApiModelProperty(value = "是否销售")
private int statusSell;
private Integer statusSell;
@ApiModelProperty(value = "是否分销")
private int isDistribution;
private Integer isDistribution;
@ApiModelProperty(value = "是否同步小家伙")
private int syncAgent;
private Integer syncAgent;
@ApiModelProperty(value = "-1未提交审核,0提交审核,1审核通过,2审核拒绝")
private int auditStatus;
private Integer auditStatus;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
private Integer isTrueName;
@ApiModelProperty(value = "限购数量")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "限购数量")
private String createdAt;
......@@ -91,7 +91,7 @@ public class PerformanceMisVo {
private String updatedAt;
@ApiModelProperty(value = "权重")
private int sort;
private Integer sort;
@ApiModelProperty(value = "权重")
private String describes;
......@@ -106,7 +106,7 @@ public class PerformanceMisVo {
private String notice;
@ApiModelProperty(value = "订单可支付时间")
private int payCountdownMinute;
private Integer payCountdownMinute;
@ApiModelProperty(value = "第三方id")
private String merchantId;
......
......@@ -17,17 +17,17 @@ public class PerformancePartnerListVo {
@ApiModelProperty(value = "结束时间")
private String timeEnd;
@ApiModelProperty(value = "总库存")
private int totalGeneral;
private Integer totalGeneral;
@ApiModelProperty(value = "销售库存")
private int saleGeneral;
private Integer saleGeneral;
@ApiModelProperty(value = "总销售金额")
private int totalSalePrice;
private Integer totalSalePrice;
@ApiModelProperty(value = "剩余库存")
private int surplusGeneral;
private Integer surplusGeneral;
@ApiModelProperty(value = "演出状态")
private int status;
private Integer status;
@ApiModelProperty(value = "提交审核状态 -1未提交审核,0提交审核,1审核通过,2审核拒绝")
private int auditStatus;
private Integer auditStatus;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt;
@ApiModelProperty(value = "创建时间")
......
......@@ -20,16 +20,16 @@ public class TicketPartnerVo implements Serializable {
private String title;
@ApiModelProperty(value = "是否学生票 0否 1是", example = "0", hidden = true)
private int isStudent;
private Integer isStudent;
@ApiModelProperty(value = "是否电子票", example = "0")
private int isElectronic;
private Integer isElectronic;
@ApiModelProperty(value = "是否快递票", example = "0")
private int isExpress;
private Integer isExpress;
@ApiModelProperty(value = "类型", example = "2")
private int type;
private Integer type;
@ApiModelProperty(value = "价格", example = "100.00")
private BigDecimal price;
......@@ -38,16 +38,16 @@ public class TicketPartnerVo implements Serializable {
private String timeEndExpress;
@ApiModelProperty(value = "总库存", example = "100")
private int totalGeneral;
private Integer totalGeneral;
@ApiModelProperty(value = "总兑换库存", example = "100")
private int totalExchange;
private Integer totalExchange;
@ApiModelProperty(value = "限购数量", example = "0")
private int limitCount;
private Integer limitCount;
@ApiModelProperty(value = "次数", example = "0")
private int counts;
private Integer counts;
@ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
private String timeStart;
......@@ -68,7 +68,7 @@ public class TicketPartnerVo implements Serializable {
private Integer status;
@ApiModelProperty(value = "是否展示二维码 0否 1是", example = "0")
private int isShowCode;
private Integer isShowCode;
@ApiModelProperty(value = "二维码显示时间", example = "2020-12-01T14:00:00")
private String qrCodeShowTime;
......@@ -77,25 +77,25 @@ public class TicketPartnerVo implements Serializable {
private String timesId;
@ApiModelProperty(value = "是否开启缺票登记")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "剩余库存", example = "100")
private int surplusGeneral;
private Integer surplusGeneral;
@ApiModelProperty(value = "剩余兑换库存", example = "100")
private int surplusExchange;
private Integer surplusExchange;
@ApiModelProperty(value = "快递类型 1寄付 2到付", example = "100")
private int expressType;
private Integer expressType;
@ApiModelProperty(value = "是否开启转赠", example = "100")
private int isTransfer;
private Integer isTransfer;
@ApiModelProperty(value = "是否 会员", example = "100")
private int isMember;
private Integer isMember;
@ApiModelProperty(value = "是否专属", example = "100")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "")
private String createdAt;
......
......@@ -28,10 +28,10 @@ public class TicketTimesPartnerVo implements Serializable {
private Integer status;
@ApiModelProperty(value = "状态 1单日票 2通票")
private int type;
private Integer type;
@ApiModelProperty(value = "是否开启缺票登记")
private int isLackRegister;
private Integer isLackRegister;
@ApiModelProperty(value = "创建时间")
......
......@@ -26,10 +26,10 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
private String useEnd;
@ApiModelProperty(value = "状态 0不可见 1可见")
private int status;
private Integer status;
@ApiModelProperty(value = "状态 1单日票 2通票")
private int type;
private Integer type;
@ApiModelProperty(value = "创建时间")
private String createdAt;
......
......@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.partner;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.entity.KylinPerformances;
......@@ -47,31 +48,31 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
* @param performancesId 演出id
* @return 演出对象
*/
PerformancePartnerVo getStep1(String performancesId);
ResponseDto<PerformancePartnerVo> getStep1(String performancesId);
/**
* 演出第二步
*
* @param step2Param 相关参数
* @return boolean
* @return String
*/
boolean step2(PerformanceStep2Param step2Param);
ResponseDto<String> step2(PerformanceStep2Param step2Param);
/**
* 演出第二步创建
*
* @param step2Param 相关参数
* @return boolean
* @return String
*/
boolean createStep2(PerformanceStep2Param step2Param);
ResponseDto<String> createStep2(PerformanceStep2Param step2Param);
/**
* 演出第二步修改
*
* @param step2Param 相关参数
* @return boolean
* @return String
*/
boolean updateStep2(PerformanceStep2Param step2Param);
ResponseDto<String> updateStep2(PerformanceStep2Param step2Param);
/**
* 获取演出第二步数据
......@@ -79,27 +80,23 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
* @param performancesId 演出id
* @return 演出 第二步 数据
*/
PerformanceStep2Param getStep2(String performancesId);
// PerformanceStep2Param getCreateStep2(String performancesId);
//
// PerformanceStep2Param getUpdateStep2(String performancesId);
ResponseDto<PerformanceStep2Param> getStep2(String performancesId);
/**
* 演出上线
*
* @param performancesId 演出id
* @return boolean
* @return String
*/
boolean onLinePerformance(String performancesId);
ResponseDto<String> onLinePerformance(String performancesId);
/**
* 演出下线
*
* @param performancesId 演出id
* @return boolean
* @return String
*/
boolean outLinePerformance(String performancesId);
ResponseDto<String> outLinePerformance(String performancesId);
/**
* 复制演出 (只有巡演类型)
......@@ -115,14 +112,14 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
* @param performancePartnerListParam 相关参数
* @return 分页 msql 数据
*/
PageInfo<PerformancePartnerListDao> getList(PerformancePartnerListParam performancePartnerListParam);
ResponseDto<PageInfo<PerformancePartnerListDao>> getList(PerformancePartnerListParam performancePartnerListParam);
/**
* 演出撤回
*
* @param performancesId 演出id
* @return boolean
* @return String
*/
boolean withdraw(String performancesId);
ResponseDto<String> withdraw(String performancesId);
}
......@@ -16,15 +16,15 @@ public class FieldMisDetailsDao implements Serializable {
private String coverImg;
private int provinceId;
private Integer provinceId;
private String provinceName;
private int cityId;
private Integer cityId;
private String cityName;
private int districtId;
private Integer districtId;
private String districtName;
......
......@@ -16,19 +16,19 @@ public class PerformanceAdminListDao {
@ApiModelProperty(value = "主办方")
private String sponsor;
@ApiModelProperty(value = "演出状态")
private int status;
private Integer status;
@ApiModelProperty(value = "提审时间")
private String auditTime;
@ApiModelProperty(value = "提交审核状态 -1未提交审核,0提交审核,1审核通过,2审核拒绝")
private int auditStatus;
private Integer auditStatus;
@ApiModelProperty(value = "总库存")
private int totalGeneral;
private Integer totalGeneral;
@ApiModelProperty(value = "销售库存")
private int saleGeneral;
private Integer saleGeneral;
@ApiModelProperty(value = "总销售金额")
private int totalSalePrice;
private Integer totalSalePrice;
@ApiModelProperty(value = "剩余库存")
private int surplusGeneral;
private Integer surplusGeneral;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt;
@ApiModelProperty(value = "创建时间")
......
......@@ -14,11 +14,11 @@ public class PerformanceMemberAuditDao {
@ApiModelProperty(value = "演出名称")
private String title;
@ApiModelProperty(value = "是否会员")
private int isMember;
private Integer isMember;
@ApiModelProperty(value = "是否专属")
private int isExclusive;
private Integer isExclusive;
@ApiModelProperty(value = "是否已提交")
private int isSubmit;
private Integer isSubmit;
@ApiModelProperty(value = "票种列表")
private List<TicketMemberAuditDao> ticketMemberAudit;
......
......@@ -16,19 +16,19 @@ public class PerformancePartnerListDao {
@ApiModelProperty(value = "结束时间")
private String timeEnd;
@ApiModelProperty(value = "总库存")
private int totalGeneral;
private Integer totalGeneral;
@ApiModelProperty(value = "销售库存")
private int saleGeneral;
private Integer saleGeneral;
@ApiModelProperty(value = "总销售金额")
private int totalSalePrice;
private Integer totalSalePrice;
@ApiModelProperty(value = "总销售金额")
private int surplusGeneral;
private Integer surplusGeneral;
@ApiModelProperty(value = "演出状态")
private int status;
private Integer status;
@ApiModelProperty(value = "演出类型")
private int type;
private Integer type;
@ApiModelProperty(value = "提交审核状态 -1未提交审核,0提交审核,1审核通过,2审核拒绝")
private int auditStatus;
private Integer auditStatus;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt;
@ApiModelProperty(value = "创建时间")
......
......@@ -15,7 +15,7 @@ public class PerformanceRecommendAdminDao {
@ApiModelProperty(value = "演出开始时间")
private String timeStart;
@ApiModelProperty(value = "演出状态")
private int status;
private Integer status;
@ApiModelProperty(value = "排序位")
private int isRecommend;
private Integer isRecommend;
}
......@@ -18,7 +18,7 @@ public class TicketMemberAuditDao {
// @ApiModelProperty(value = "使用时间结束")
// private String useEnd;
@ApiModelProperty(value = "状态")
private int status;
private Integer status;
@ApiModelProperty(value = "开售时间")
private String timeStart;
@ApiModelProperty(value = "原价")
......@@ -26,12 +26,12 @@ public class TicketMemberAuditDao {
@ApiModelProperty(value = "会员优惠价格")
private BigDecimal priceDiscountMember;
@ApiModelProperty(value = "会员优惠时间段限购数量")
private int memberLimitCount;
private Integer memberLimitCount;
@ApiModelProperty(value = "会员提前开售分钟")
private int advanceMinuteMember;
private Integer advanceMinuteMember;
@ApiModelProperty(value = "是否会员")
private int isMember;
private Integer isMember;
@ApiModelProperty(value = "是否专属")
private int isExclusive;
private Integer isExclusive;
}
......@@ -26,25 +26,19 @@ public class PerformancePartnerController {
@ApiOperation(value = "演出列表")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody PerformancePartnerListParam performancePartnerListParam) {
PageInfo<PerformancePartnerListDao> result = null;
result = performancesPartnerService.getList(performancePartnerListParam);
if (null == result) {
return ResponseDto.failure("列表获取失败");
} else {
return ResponseDto.success(result);
}
return performancesPartnerService.getList(performancePartnerListParam);
}
@PostMapping(value = "copy")
@ApiOperation(value = "复制演出")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Map<String,String>> copyPerformance(@RequestParam("performancesId") String performancesId) {
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);
Map<String, String> map = new HashMap<>();
map.put("performancesId", result);
return ResponseDto.success(map);
}
}
......@@ -54,24 +48,21 @@ public class PerformancePartnerController {
@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);
}
return performancesPartnerService.getStep1(performancesId);
}
@PostMapping(value = "step1")
@ApiOperation(value = "操作演出第一步")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Map<String,String>> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
public ResponseDto<Map<String, String>> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
String result = performancesPartnerService.step1(performanceStep1Param);
if (result.isEmpty()) {
return ResponseDto.failure("操作失败");
} else if (result.equals("不可修改")) {
return ResponseDto.failure(result);
} else {
Map<String,String> map = new HashMap<>();
map.put("performancesId",result);
Map<String, String> map = new HashMap<>();
map.put("performancesId", result);
return ResponseDto.success(map);
}
}
......@@ -81,59 +72,34 @@ public class PerformancePartnerController {
@ApiOperation(value = "操作演出第二步")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> step2(@RequestBody PerformanceStep2Param performanceStep2Param) {
boolean result = performancesPartnerService.step2(performanceStep2Param);
if (!result) {
return ResponseDto.failure("提交失败");
} else {
return ResponseDto.success("提交完成");
}
return performancesPartnerService.step2(performanceStep2Param);
}
@GetMapping(value = "step2")
@ApiOperation(value = "获取演出第二步数据")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceStep2Param> getStep2(@RequestParam("performancesId") String performancesId) {
PerformanceStep2Param result = performancesPartnerService.getStep2(performancesId);
if (result == null) {
return ResponseDto.failure("获取数据失败");
} else {
return ResponseDto.success(result);
}
return performancesPartnerService.getStep2(performancesId);
}
@PostMapping(value = "online")
@ApiOperation(value = "演出上线")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> onLinePerformance(@RequestParam("performancesId") String performancesId) {
boolean result = performancesPartnerService.onLinePerformance(performancesId);
if (result) {
return ResponseDto.success("上架成功");
} else {
return ResponseDto.failure("上架失败");
}
return performancesPartnerService.onLinePerformance(performancesId);
}
@PostMapping(value = "outline")
@ApiOperation(value = "演出下线")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> outLinePerformance(@RequestParam("performancesId") String performancesId) {
boolean result = performancesPartnerService.outLinePerformance(performancesId);
if (result) {
return ResponseDto.success("下架成功");
} else {
return ResponseDto.failure("下架失败");
}
return performancesPartnerService.outLinePerformance(performancesId);
}
@PostMapping(value = "withdraw")
@ApiOperation(value = "演出撤回")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> withdraw(@RequestParam("performancesId") String performancesId) {
boolean result = performancesPartnerService.withdraw(performancesId);
if (result) {
return ResponseDto.success("撤回成功");
} else {
return ResponseDto.failure("撤回失败");
}
return performancesPartnerService.withdraw(performancesId);
}
}
......@@ -20,7 +20,13 @@
20109=下线失败
20110=不可上线
20111=不可下线
20112=不可修改
20113=未创建场次
20114=有场次为创建票种
20115=提交失败
20116=不可撤回
20117=撤回失败
#APP JDM
20201=
\ No newline at end of file
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