Merge remote-tracking branch 'origin/dev' into dev

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

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

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

@@ -4,7 +4,6 @@ public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
 
     public static final String PERFORMANCES = "kylin:performances:info";
-    public static final String PERFORMANCES_ROADSHOW = "kylin:performances:roadshow";
     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";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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;
 

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

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

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

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

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

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

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

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

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

@@ -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;
 

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

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

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

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

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

@@ -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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -16,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 = "创建时间")

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

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

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

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

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

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

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

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

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

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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -522,3 +522,21 @@ CREATE TABLE `kylin_order_tickets_refund`
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT '订单退款';
+
+-- 购票须知表
+drop TABLE if exists `kylin_buy_notice`;
+CREATE TABLE `kylin_buy_notice`
+(
+    `mid`           int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `buy_notice_id` varchar(255)     NOT NULL DEFAULT '' COMMENT 'buy_notice_id',
+    `title`         varchar(255)     NOT NULL DEFAULT '' COMMENT '标题',
+    `img_url`       varchar(255)     NOT NULL DEFAULT '' COMMENT '图片地址',
+    `message`       varchar(255)     NOT NULL DEFAULT '' COMMENT '内容',
+    `status`        tinyint          NOT NULL DEFAULT 1 COMMENT '状态 1可用 0弃用',
+    `sort`          int(10)          NOT NULL DEFAULT 0 COMMENT '排序 大在上',
+    `created_at`    datetime         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`    datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    KEY `kylin_order_tickets_refund_uid_index` (`buy_notice_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT '购票须知表';
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.controller;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -99,7 +100,18 @@ public class KylinPerformancesController {
         if (result.size() > 0) {
             return ResponseDto.success(result);
         } else {
-            return ResponseDto.failure("获取演出列表失败");
+            return ResponseDto.failure("获取演出详情失败");
+        }
+    }
+
+    @GetMapping("partner/{performancesId}")
+    @ApiOperation("场次票种")
+    public ResponseDto<List<TicketTimesVo>> ticketTimesPartner(@PathVariable("performancesId") String performancesId) {
+        List<TicketTimesVo> result = kylinPerformancesService.ticketTimesPartner(performancesId);
+        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/partner/KylinBuyNoticeParnterController.java

+package com.liquidnet.service.kylin.controller.partner;
+
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.service.impl.partner.KylinBuyNoticePartnerServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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>
+ * 购票须知表 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Api(tags = "第三方-购票须知")
+@RestController
+@RequestMapping("partner/buyNotice")
+public class KylinBuyNoticeParnterController {
+
+    @Autowired
+    private KylinBuyNoticePartnerServiceImpl buyNoticePartnerService;
+
+    @GetMapping(value = "")
+    @ApiOperation(value = "购票须知列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<BuyNoticeVo>> copyPerformance() {
+        PageInfo<BuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
+        if (null == result) {
+            return ResponseDto.failure("查询失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketTimesPartnerController.java

@@ -31,38 +31,21 @@ public class KylinTicketTimesPartnerController {
     @ApiOperation(value = "创建场次")
     @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 {
-            return ResponseDto.success(result);
-        }
+        return ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
     }
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除场次")
     @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
-        boolean result = ticketTimesPartnerService.deleteTimes(ticketTimesId);
-        if (result) {
-            return ResponseDto.success("删除成功");
-        } else {
-            return ResponseDto.failure("删除失败");
-        }
+        return ticketTimesPartnerService.deleteTimes(ticketTimesId);
     }
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改场次")
     @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("修改失败");
-        } else {
-            return ResponseDto.success(result);
-        }
+        return ticketTimesPartnerService.changeTimes(createTicketTimesParam);
     }
 
     @GetMapping(value = "/details")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java

@@ -31,51 +31,28 @@ public class KylinTicketsPartnerController {
     @ApiOperation(value = "创建票务")
     @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 {
-            return ResponseDto.success(result);
-        }
+        return ticketsPartnerService.createTicketSummary(ticketCreateParam);
     }
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改票务")
     @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("修改票务失败");
-        } else {
-            return ResponseDto.success(result);
-        }
+        return ticketsPartnerService.updateTicket(ticketCreateParam);
     }
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除票务")
     @ApiResponse( code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") String ticketsId) {
-        boolean result = ticketsPartnerService.deleteTicket(ticketsId);
-        if (!result) {
-            return ResponseDto.failure("删除票务失败");
-        } else {
-            return ResponseDto.success("删除成功");
-        }
+        return ticketsPartnerService.deleteTicket(ticketsId);
     }
 
     @PostMapping(value = "/copy")
     @ApiOperation(value = "复制票务")
     @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("复制票务失败");
-        } else {
-            return ResponseDto.success(result);
-        }
+        return ticketsPartnerService.copyTicket(ticketsId);
     }
 
     @GetMapping(value = "/details")
@@ -95,23 +72,13 @@ public class KylinTicketsPartnerController {
     @ApiOperation(value = "票上线")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> onLine(@RequestParam("ticketsId") String ticketsId) {
-        boolean result = ticketsPartnerService.onLine(ticketsId);
-        if (!result) {
-            return ResponseDto.failure("操作失败");
-        } else {
-            return ResponseDto.success("操作成功");
-        }
+        return ticketsPartnerService.onLine(ticketsId);
     }
 
     @PostMapping(value = "/outLine")
     @ApiOperation(value = "票下线")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> outLine(@RequestParam("ticketsId") String ticketsId) {
-        boolean result = ticketsPartnerService.outLine(ticketsId);
-        if (!result) {
-            return ResponseDto.failure("操作失败");
-        } else {
-            return ResponseDto.success("操作成功");
-        }
+        return ticketsPartnerService.outLine(ticketsId);
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,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);
         }
     }
@@ -55,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);
         }
     }
@@ -82,47 +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) {
+        return performancesPartnerService.withdraw(performancesId);
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

 package com.liquidnet.service.kylin.service.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.TicketVo;
+import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
@@ -21,6 +25,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -72,6 +77,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         if (!title.isEmpty()) {
             queryObject.put("title", Pattern.compile(title, Pattern.CASE_INSENSITIVE));
         }
+        if (!cityName.isEmpty()) {
+            queryObject.put("cityName", Pattern.compile(cityName, Pattern.CASE_INSENSITIVE));
+        }
         if (type > 0) {
             queryObject.put("type", type);
         }
@@ -102,7 +110,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-        query.addCriteria(Criteria.where("statusSell").is(1));
 
         // 要查询的字段
         /*Document fieldsObject = new Document();
@@ -111,6 +118,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         // 查询总数
         long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        query.getQueryObject();
 
         query.with(pageable);
 
@@ -119,6 +127,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         // 组合数据
         info.put("total", count);
         info.put("list", list);
+        info.put("is_native", 1);
+        info.put("recommend", 0);
 
         return info;
     }
@@ -129,7 +139,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-        query.addCriteria(Criteria.where("statusSell").is(1));
 
         // 今天的
         LocalDateTime toDayTime = LocalDateTime.now();
@@ -144,7 +153,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         LocalDateTime nowTimeT = LocalDateTime.now();
         String nowTimeStrT = nowTimeT.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT));
-        queryT.addCriteria(Criteria.where("statusSell").is(1));
 
         LocalDateTime threeDaysLater = toDayTime.plusDays(3);
         String threeDaysLaterStr = threeDaysLater.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
@@ -163,7 +171,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-        query.addCriteria(Criteria.where("statusSell").is(1));
         // 推荐
         query.addCriteria(Criteria.where("isRecommend").is(1));
         List<PerformanceVo> recommendList = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
@@ -189,20 +196,39 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             roadShowId = performancesInfo.getRoadShowId();
         }
 
-        List roadList = new ArrayList();
+        List<PerformanceVo> roadList = new ArrayList();
         if (Integer.parseInt(roadShowId) > 0) {
-            roadList = redisUtil.lGet(KylinRedisConst.PERFORMANCES_ROADSHOW.concat(roadShowId), 0, -1);
-            if (roadList.isEmpty()) {
             roadList = mongoTemplate.find(
                     Query.query(Criteria.where("roadShowId").is(roadShowId)),
                     PerformanceVo.class,
                     PerformanceVo.class.getSimpleName()
             );
-                for(Object pinfo : roadList) {
-                    redisUtil.lSet(KylinRedisConst.PERFORMANCES_ROADSHOW.concat(roadShowId), pinfo);
         }
+
+        // 处理状态 购买 未开始 结束可更改   下架 售馨不可更改
+        if (performancesInfo.getAppStatus() == 6 || performancesInfo.getAppStatus() == 9 || performancesInfo.getAppStatus() == 10) {
+            String stopSellTime = performancesInfo.getStopSellTime();
+            String sellTime = performancesInfo.getSellTime();
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            LocalDateTime stopSellTimeL = LocalDateTime.parse(stopSellTime, df);
+            LocalDateTime sellTimeL = LocalDateTime.parse(sellTime, df);
+
+            LocalDateTime nowTime = LocalDateTime.now();
+            String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            LocalDateTime nowTimeStrL = LocalDateTime.parse(nowTimeStr, df);
+
+            if (sellTimeL.isAfter(nowTimeStrL)) {// 未开始
+                performancesInfo.setAppStatus(9);
+            } else { // 购买
+                performancesInfo.setAppStatus(6);
+            }
+            if (stopSellTimeL.isBefore(nowTimeStrL)) { // 已结束
+                performancesInfo.setAppStatus(10);
+            } else { // 购买
+                performancesInfo.setAppStatus(6);
             }
         }
+        performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         info.put("performancesInfo", performancesInfo);
         info.put("roadList", roadList);
@@ -210,4 +236,51 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return info;
     }
 
+    public List<TicketTimesVo> ticketTimesPartner(String performancesId) {
+        HashMap<String, Object> info = new HashMap<>();
+
+        List<TicketTimesVo> ticketTimesList = mongoTemplate.find(
+                Query.query(Criteria.where("performanceId").is(performancesId)),
+                TicketTimesVo.class,
+                TicketTimesVo.class.getSimpleName()
+        );
+        for (TicketTimesVo partner : ticketTimesList) {
+            List<TicketVo> ticketList = mongoTemplate.find(
+                    Query.query(Criteria.where("timeId").is(partner.getTimeId())),
+                    TicketVo.class,
+                    TicketVo.class.getSimpleName()
+            );
+
+            for (TicketVo ticket : ticketList) {
+                // 处理状态 购买 未开始 结束可更改   下架 售馨不可更改
+                if (ticket.getStatus() == 6 || ticket.getStatus() == 9 || ticket.getStatus() == 10) {
+                    String timeEnd = ticket.getTimeEnd();
+                    String timeStart = ticket.getTimeStart();
+                    DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                    LocalDateTime timeEndL = LocalDateTime.parse(timeEnd, df);
+                    LocalDateTime timeStartL = LocalDateTime.parse(timeStart, df);
+
+                    LocalDateTime nowTime = LocalDateTime.now();
+                    String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    LocalDateTime nowTimeStrL = LocalDateTime.parse(nowTimeStr, df);
+
+                    if (timeStartL.isAfter(nowTimeStrL)) {// 未开始
+                        ticket.setStatus(9);
+                    } else { // 购买
+                        ticket.setStatus(6);
+                    }
+                    if (timeEndL.isBefore(nowTimeStrL)) { // 已结束
+                        ticket.setStatus(10);
+                    } else { // 购买
+                        ticket.setStatus(6);
+                    }
+                }
+            }
+
+            partner.setTicketList(ticketList);
+        }
+
+        return ticketTimesList;
+    }
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinPerformancesAdminServiceImpl.java

@@ -6,7 +6,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
@@ -120,7 +119,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 map.put("auditStatus", auditStatus);
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 BasicDBObject objectPerformanceVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                Document doc = mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).findOneAndUpdate(
+                Document doc = mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).findOneAndUpdate(
                         Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                         objectPerformanceVo,
                         new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
@@ -159,10 +158,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     }
                 } else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
                     log.info(" PERFORMANCE  演出审核 修改");
+
                     HashMap<String, Object> mapSql = new HashMap<>();
                     mapSql.put("status", 9);
                     mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    performanceVoTask.updatePerformanceMySql(performancesId, mapSql, performanceVoTask.getPerformanceMisVo(performancesId), updatedAt);
+                    performanceVoTask.updatePerformanceMySql(performancesId, mapSql, performanceVoTask.getPerformanceMisVo(performancesId), updatedAt,auditStatus);
                     if (sqlStatus.getStatus() == 6) {//若 演出上 则 线判断状态
                         performanceVoTask.performanceVoStatus(performancesId);
                     }
@@ -176,10 +176,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 map.put("status", status);
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                         object
                 );
+
+                KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
+                performanceStatus.setAuditStatus(auditStatus);
+                performanceStatus.setUpdatedAt(updatedAt);
+                performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+
+
 //                mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
 //                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
 //                        object

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinBuyNoticePartnerServiceImpl.java

+package com.liquidnet.service.kylin.service.impl.partner;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 购票须知表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Service
+public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNoticeMapper, KylinBuyNotice> implements IKylinBuyNoticePartnerService {
+
+    @Autowired
+    private KylinBuyNoticeMapper kylinBuyNoticeMapper;
+
+    @Override
+    public PageInfo<BuyNoticeVo> getBuyNotice() {
+        PageInfo<BuyNoticeVo> pageInfoTmp = null;
+
+        PageHelper.startPage(1, 20);
+        List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().eq("status", 1).orderByDesc("sort").orderByDesc("mid"));
+
+        List<BuyNoticeVo> buyNoticeVoList = new ArrayList<>();
+        for (KylinBuyNotice item : buyNoticeList) {
+            BuyNoticeVo buyNoticeVo = new BuyNoticeVo();
+            BeanUtils.copyProperties(item, buyNoticeVo);
+            buyNoticeVoList.add(buyNoticeVo);
+        }
+        pageInfoTmp = new PageInfo(buyNoticeVoList);
+
+        return pageInfoTmp;
+    }
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -7,6 +7,8 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.TicketInventoryDto;
@@ -22,6 +24,7 @@ import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
+import com.liquidnet.service.kylin.utils.DataUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -33,7 +36,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -42,7 +44,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -66,7 +67,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     private RedisUtil redisUtil;
 
     @Autowired
-    private RedisTemplate redisTemplate;
+    private DataUtils dataUtils;
 
     @Autowired
     private PerformanceVoTask performanceVoTask;
@@ -109,7 +110,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             result = createStep1(step1Param);
             log.info(" PERFORMANCE  演出第一步 创建");
         } else { // 获取 create 数据 status = 0 或 无数据 创建
-            PerformanceParam createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformanceParam.class, PerformanceParam.class.getSimpleName());
+            PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             if (createParam == null) {
                 result = createStep1(step1Param);
                 log.info(" PERFORMANCE  演出第一步 创建");
@@ -130,28 +131,28 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
 
         try {
             step1Param.setPerformancesId(performanceId);
-            PerformanceParam performanceParam = new PerformanceParam();
-            BeanUtils.copyProperties(step1Param, performanceParam);
-            performanceParam.setIsTrueName(0);
-            performanceParam.setLimitCount(0);
-            performanceParam.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            performanceParam.setIsSubmit(0);
-            performanceParam.setStatus(0);
-            performanceParam.setStatusSell(1);
-            performanceParam.setRoadShowId("0");
-            performanceParam.setProjectId("0");
-            performanceParam.setIsShow(1);
-            performanceParam.setFieldName((String)redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceParam.getFieldId(), "name"));
-
+            PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
+            BeanUtils.copyProperties(step1Param, performancePartnerVo);
+            performancePartnerVo.setIsTrueName(0);
+            performancePartnerVo.setLimitCount(0);
+            performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            performancePartnerVo.setIsSubmit(0);
+            performancePartnerVo.setStatus(0);
+            performancePartnerVo.setStatusSell(1);
+            performancePartnerVo.setAuditStatus(-1);
+            performancePartnerVo.setRoadShowId("0");
+            performancePartnerVo.setProjectId("0");
+            performancePartnerVo.setIsShow(1);
+            performancePartnerVo.setFieldName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
+            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
 
             mongoTemplate.insert(
-                    performanceParam, PerformanceParam.class.getSimpleName()
+                    performancePartnerVo, PerformancePartnerVo.class.getSimpleName()
             );
-
             return performanceId;
         } catch (Exception e) {
             e.printStackTrace();
-            return "";
+            return null;
         }
     }
 
@@ -161,85 +162,64 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         LocalDateTime timeNow = LocalDateTime.now();
         String performanceId = step1Param.getPerformancesId();
         try {
+            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
+                    PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+            if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
+                return "不可修改";
+            }
+
             step1Param.setPerformancesId(performanceId);
-            PerformanceParam performanceParam = new PerformanceParam();
-            BeanUtils.copyProperties(step1Param, performanceParam);
-            performanceParam.setCreatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            performanceParam.setUpdatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            performanceParam.setIsSubmit(0);
-            performanceParam.setStatus(0);
-            PerformanceParam data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
-                    PerformanceParam.class, PerformanceParam.class.getSimpleName());
+            PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
+            BeanUtils.copyProperties(step1Param, performancePartnerVo);
+            performancePartnerVo.setCreatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            performancePartnerVo.setUpdatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            performancePartnerVo.setIsSubmit(0);
+            performancePartnerVo.setStatus(0);
+            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
             if (data != null) { // 有修改记录
-                performanceParam.setIsTrueName(data.getIsTrueName());
-                performanceParam.setLimitCount(data.getLimitCount());
-                performanceParam.setStatusSell(data.getStatusSell());
-                performanceParam.setRoadShowId(data.getRoadShowId());
-                performanceParam.setProjectId(data.getProjectId());
-                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performanceParam));
-                mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
+                performancePartnerVo.setIsTrueName(data.getIsTrueName());
+                performancePartnerVo.setLimitCount(data.getLimitCount());
+                performancePartnerVo.setStatusSell(data.getStatusSell());
+                performancePartnerVo.setRoadShowId(data.getRoadShowId());
+                performancePartnerVo.setProjectId(data.getProjectId());
+                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performancePartnerVo));
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                         object
                 );
             } else { // 无修改记录
                 KylinPerformanceStatus statusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performanceId", performanceId));
                 KylinPerformanceRelations relationsData = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performancesId", performanceId));
-                performanceParam.setIsTrueName(statusData.getIsTrueName());
-                performanceParam.setLimitCount(statusData.getLimitCount());
-                performanceParam.setStatusSell(statusData.getStatusSell());
-                performanceParam.setRoadShowId(relationsData.getRoadShowId());
-                performanceParam.setProjectId(relationsData.getProjectId());
+                performancePartnerVo.setIsTrueName(statusData.getIsTrueName());
+                performancePartnerVo.setLimitCount(statusData.getLimitCount());
+                performancePartnerVo.setStatusSell(statusData.getStatusSell());
+                performancePartnerVo.setRoadShowId(relationsData.getRoadShowId());
+                performancePartnerVo.setProjectId(relationsData.getProjectId());
                 mongoTemplate.insert(
-                        performanceParam, PerformanceParam.class.getSimpleName()
+                        performancePartnerVo, PerformancePartnerVo.class.getSimpleName()
                 );
             }
             return performanceId;
         } catch (Exception e) {
-            return "";
+            return null;
         }
     }
 
     @Override
-    public PerformancePartnerVo getStep1(String performancesId) {
-        PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
-//        PerformanceParam updateData = getUpdateStep1(performancesId);
-        PerformanceParam data = mongoTemplate.findOne(
-                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+    public ResponseDto<PerformancePartnerVo> getStep1(String performancesId) {
+        PerformancePartnerVo data = mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()
         );
         if (data == null) {
-            return performancePartnerVo;
+            return ResponseDto.failure(ErrorMapping.get("20104"));
         }
-        BeanUtils.copyProperties(data, performancePartnerVo);
         log.info(" PERFORMANCE  演出第一步 获取");
-        return performancePartnerVo;
-    }
-
-//    @Override
-//    public PerformanceParam getCreateStep1(String performancesId) {
-//        PerformanceParam data = mongoTemplate.findOne(
-//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
-//        );
-//        if (data == null) {
-//            return new PerformanceParam();
-//        }
-//        return data;
-//    }
-//
-//    @Override
-//    public PerformanceParam getUpdateStep1(String performancesId) {
-//
-//        PerformanceParam data = mongoTemplate.findOne(
-//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
-//        );
-//        if (data == null) {
-//            return new PerformanceParam();
-//        }
-//        return data;
-//    }
+        return ResponseDto.success(data);
+    }
 
     @Override
-    public boolean step2(PerformanceStep2Param step2Param) {
-        boolean result = false;
+    public ResponseDto<String> step2(PerformanceStep2Param step2Param) {
+        ResponseDto<String> result = null;
         // 无 performancesId 则 创建
         if (step2Param.getPerformancesId().isEmpty()) {
         } else { // 获取 create 数据 status = 0 或 无数据 创建
@@ -256,19 +236,19 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     }
 
     @Override
-    public boolean createStep2(PerformanceStep2Param step2Param) {
-
+    public ResponseDto<String> createStep2(PerformanceStep2Param step2Param) {
+        try {
             // 获取 主键id
             String performanceId = step2Param.getPerformancesId();
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
 
-        boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)),
-                PerformanceParam.class,
-                PerformanceParam.class.getSimpleName());
+            boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("auditStatus").is(0)),
+                    PerformancePartnerVo.class,
+                    PerformancePartnerVo.class.getSimpleName());
 
             if (isExistsSubmit) {
-            return false;
+                return ResponseDto.failure(ErrorMapping.get("20112"));
             }
 
             //演出修改数据
@@ -283,7 +263,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             if (step2Param.getIsSubmit() == 1) { // 提交
                 map.put("status", 1);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                         object
                 );
@@ -292,11 +272,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVoList) {
                     boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
                     if (boolResult) {
-                    return false;
+                        return ResponseDto.failure(ErrorMapping.get("20114"));
                     }
                 }
                 if (ticketTimesPartnerVoList.size() <= 0) {
-                return false;
+                    return ResponseDto.failure(ErrorMapping.get("20113"));
                 } else {
                     PerformanceMisVo performanceMisVo = performanceVoTask.getPerformanceMisVo(performanceId);
 
@@ -310,32 +290,36 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     performances.setAuditTime(LocalDateTime.now());
                     performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
                 }
+                return ResponseDto.success("操作成功");
             } else { //保存
                 map.put("status", 0);
                 map.put("isCreateSave", 1);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateMany(
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                         object
                 );
+                return ResponseDto.success("保存成功");
+            }
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get("20115"));
         }
-
-        return true;
     }
 
     @Override
-    public boolean updateStep2(PerformanceStep2Param step2Param) {
+    public ResponseDto<String> updateStep2(PerformanceStep2Param step2Param) {
+        try {
             // 获取 主键id
             String performanceId = step2Param.getPerformancesId();
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
 
-        boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)),
-                PerformanceParam.class,
-                PerformanceParam.class.getSimpleName());
+            boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("auditStatus").is(0)),
+                    PerformancePartnerVo.class,
+                    PerformancePartnerVo.class.getSimpleName());
 
             if (isExistsSubmit) {
-            return false;
+                return ResponseDto.failure(ErrorMapping.get("20112"));
             }
 
             //演出修改数据
@@ -350,7 +334,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             if (step2Param.getIsSubmit() == 1) { // 提交
                 map.put("status", 1);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                         object
                 );
@@ -359,11 +343,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVoList) {
                     boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
                     if (boolResult) {
-                    return false;
+                        return ResponseDto.failure(ErrorMapping.get("20114"));
                     }
                 }
                 if (ticketTimesPartnerVoList.size() <= 0) {
-                return false;
+                    return ResponseDto.failure(ErrorMapping.get("20113"));
                 } else {
                     PerformanceMisVo performanceMisVo = performanceVoTask.getPerformanceMisVo(performanceId);
 
@@ -374,6 +358,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     KylinPerformances performances = new KylinPerformances();
                     performances.setAuditTime(LocalDateTime.now());
                     performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
+                    KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
+                    performanceStatus.setAuditStatus(0);
+                    performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
 
                     //提示：票种价格、售票时间、购票限制 直接生效
                     List<TicketTimesTicketCreatePartnerVo> timeList = performanceMisVo.getTicketTimes();
@@ -408,26 +395,29 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         }
                     }
                 }
+                return ResponseDto.success("操作完成");
             } else { //保存
                 map.put("status", 0);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateMany(
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                         object
                 );
+                return ResponseDto.success("保存成功");
+            }
+        }catch (Exception e){
+            return ResponseDto.failure(ErrorMapping.get("20115"));
         }
-
-        return true;
     }
 
     @Override
-    public PerformanceStep2Param getStep2(String performancesId) {
+    public ResponseDto<PerformanceStep2Param> getStep2(String performancesId) {
         PerformanceStep2Param performanceCreatePartnerVo = null;
-        PerformanceParam data = mongoTemplate.findOne(
-                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+        PerformancePartnerVo data = mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()
         );
         if (data == null) {
-            return new PerformanceStep2Param();
+            return ResponseDto.failure(ErrorMapping.get("20104"));
         }
         List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
         List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
@@ -445,71 +435,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
         performanceCreatePartnerVo = performanceStep2Param;
         log.info(" PERFORMANCE  演出第二步 获取");
-        return performanceCreatePartnerVo;
-    }
-
-//    @Override
-//    public PerformanceStep2Param getCreateStep2(String performancesId) {
-//        PerformanceParam data = mongoTemplate.findOne(
-//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
-//        );
-//
-//        if (data == null) {
-//            return new PerformanceStep2Param();
-//        }
-//
-//        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
-//        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList();
-//
-//        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
-//            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
-//            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
-//            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
-//            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
-//            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
-//        }
-//
-//        PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
-//        BeanUtils.copyProperties(data, performanceStep2Param);
-//        performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-//
-//        return performanceStep2Param;
-//    }
-//
-//    @Override
-//    public PerformanceStep2Param getUpdateStep2(String performancesId) {
-//        PerformanceParam data = mongoTemplate.findOne(
-//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
-//        );
-//
-//        if (data == null) {
-//            return new PerformanceStep2Param();
-//        }
-//
-//        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
-//        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
-//
-//        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
-//            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
-//            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
-//            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
-//            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
-//            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
-//        }
-//
-//        PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
-//        BeanUtils.copyProperties(data, performanceStep2Param);
-//        performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-//
-//        return performanceStep2Param;
-//    }
+        return ResponseDto.success(performanceCreatePartnerVo);
+    }
 
     @Override
-    public boolean onLinePerformance(String performancesId) {
+    public ResponseDto<String> onLinePerformance(String performancesId) {
         try {
             KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
             if (!(performanceStatusData.getStatus() == 3 || performanceStatusData.getStatus() == 7)) {
-                return false;
+                return ResponseDto.failure(ErrorMapping.get("20110"));
             }
             // mysql
             LocalDateTime updatedAt = LocalDateTime.now();
@@ -527,14 +461,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performanceVoData.setPerformanceRelations(performanceRelationsData);
             performanceVoData.setPerformanceStatus(performanceStatusData);
 
-            String cityName=(String) redisUtil.hget(KylinRedisConst.FIELDS+":"+performanceVoData.getFieldId(),"city_name");
+            String cityName = (String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceVoData.getFieldId(), "city_name");
             KylinFields fields = new KylinFields();
             fields.setCityId(null);
-            fields.setLatitude((String) redisUtil.hget(KylinRedisConst.FIELDS+":"+performanceVoData.getFieldId(),"latitude"));
-            fields.setLongitude((String) redisUtil.hget(KylinRedisConst.FIELDS+":"+performanceVoData.getFieldId(),"longitude"));
-            fields.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS+":"+performanceVoData.getFieldId(),"city_name"));
-            fields.setName((String) redisUtil.hget(KylinRedisConst.FIELDS+":"+performanceVoData.getFieldId(),"name"));
-            performanceVoData.setFieldsData(fields,cityName);
+            fields.setLatitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceVoData.getFieldId(), "latitude"));
+            fields.setLongitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceVoData.getFieldId(), "longitude"));
+            fields.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceVoData.getFieldId(), "city_name"));
+            fields.setName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceVoData.getFieldId(), "name"));
+            performanceVoData.setFieldsData(fields, cityName);
 
             //场次
             List<KylinTicketTimeRelation> ticketTimeRelation = ticketTimeRelationMapper.selectList(
@@ -650,31 +584,23 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         performanceVoData, PerformanceVo.class.getSimpleName()
                 );
             }
-//            //修改 提审vo
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("status", 3);
-//            BasicDBObject objectPerformance = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-//            mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
-//                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
-//                    objectPerformance
-//            );
             //判断状态
             performanceVoTask.performanceVoStatus(performancesId);
-            return true;
+            return ResponseDto.success("上线成功");
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("20108"));
         }
     }
 
     @Override
-    public boolean outLinePerformance(String performancesId) {
+    public ResponseDto<String> outLinePerformance(String performancesId) {
         try {
 
             KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
 
             if (performanceStatusData.getStatus() != 6) {
-                return false;
+                return ResponseDto.failure(ErrorMapping.get("20111"));
             }
 
             LocalDateTime updatedAt = LocalDateTime.now();
@@ -712,15 +638,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     mongoTemplate.remove(Query.query(Criteria.where("ticketsId").is(ticketVoItem.getTicketsId())), TicketVo.class, TicketVo.class.getSimpleName());
                 }
             }
-            return true;
+            return ResponseDto.success("下线成功");
         } catch (Exception e) {
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("20109"));
         }
     }
 
     @Override
     public String copyPerformance(String performancesId) {
-
+        try {
             PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performances_id").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             //复制演出
             performancePartnerVo.setPerformancesId(IDGenerator.nextSnowId().toString());
@@ -744,10 +670,13 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 }
             }
             return performancePartnerVo.getPerformancesId();
+        }catch (Exception e){
+            return null;
+        }
     }
 
     @Override
-    public PageInfo<PerformancePartnerListDao> getList(PerformancePartnerListParam performancePartnerListParam) {
+    public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(PerformancePartnerListParam performancePartnerListParam) {
         int status = performancePartnerListParam.getStatus();
         int page = performancePartnerListParam.getPage() - 1;
         int size = performancePartnerListParam.getSize();
@@ -763,12 +692,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
             Query query = Query.query(criteria);
             // 查询总数
-            long count = mongoTemplate.count(query, PerformanceParam.class, PerformanceParam.class.getSimpleName());
-            List<PerformanceParam> performanceParam = mongoTemplate.find(query, PerformanceParam.class, PerformanceParam.class.getSimpleName());
+            long count = mongoTemplate.count(query, PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+            List<PerformancePartnerVo> performancePartnerVo = mongoTemplate.find(query, PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             query.with(pageable);
             //处理Vo
             List<PerformancePartnerListVo> voList = new ArrayList<>();
-            for (PerformanceParam item : performanceParam) {
+            for (PerformancePartnerVo item : performancePartnerVo) {
                 PerformancePartnerListVo voData = new PerformancePartnerListVo();
                 voData.setStatus0Data(item);
                 voList.add(voData);
@@ -782,9 +711,42 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
                 pageInfoTmp = new PageInfo(voList);
             } catch (Exception e) {
-                return null;
+                return ResponseDto.failure(ErrorMapping.get("20104"));
+            }
+        }
+        return ResponseDto.success(pageInfoTmp);
+    }
+
+    @Override
+    public ResponseDto<String> withdraw(String performancesId) {
+        try {
+            //mysql auditStatus
+            KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+            if (performanceStatus != null && performanceStatus.getAuditStatus() == 0) {
+                KylinPerformanceStatus data1 = new KylinPerformanceStatus();
+                HashMap<String, Object> map = new HashMap<>();
+                if (performanceStatus.getStatus() >= 3) {//通过审核
+                    data1.setAuditStatus(1);
+                    map.put("auditStatus", 1);
+                } else if (performanceStatus.getStatus() == 4) {//未通过审核
+                    data1.setAuditStatus(-1);
+                    map.put("auditStatus", -1);
+                } else {
+                    data1.setAuditStatus(2);
+                    map.put("auditStatus", 2);
+                }
+                performanceStatusMapper.update(data1, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                        object
+                );
+                return ResponseDto.success("撤回成功");
+            } else {
+                return ResponseDto.failure(ErrorMapping.get("20116"));
             }
+        }catch (Exception e){
+            return ResponseDto.failure(ErrorMapping.get("20117"));
         }
-        return pageInfoTmp;
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
@@ -50,9 +52,6 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     @Autowired
     private MongoConverter mongoConverter;
 
-    @Autowired
-    private KylinTicketTimesMapper ticketTimesMapper;
-
     @Autowired
     private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
 
@@ -60,8 +59,8 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     private KylinPerformanceStatusMapper performanceStatusMapper;
 
     @Override
-    public TicketTimesPartnerVo createTimesSummary(CreateTicketTimesParam createTicketTimesParam) {
-        TicketTimesPartnerVo ticketTimesPartnerVo = null;
+    public ResponseDto<TicketTimesPartnerVo> createTimesSummary(CreateTicketTimesParam createTicketTimesParam) {
+        ResponseDto<TicketTimesPartnerVo> ticketTimesPartnerVo = null;
         //获取演出状态
         KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
                 new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId()));
@@ -79,8 +78,8 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     }
 
     @Override
-    public TicketTimesPartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam) {
-
+    public ResponseDto<TicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam) {
+        try {
             // 获取 主键id
             String ticketTimesId = IDGenerator.nextSnowId().toString();
             // 获取 当前时间 -> 创建时间
@@ -92,7 +91,6 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             } else {
                 title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
             }
-
             // mongo 操作
             TicketTimesPartnerVo ticketTimesPartnerVo = new TicketTimesPartnerVo();
             ticketTimesPartnerVo.setTicketTimesId(ticketTimesId);
@@ -103,15 +101,19 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             ticketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
             ticketTimesPartnerVo.setType(createTicketTimesParam.getType());
             ticketTimesPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        TicketTimesPartnerVo data = mongoTemplate.insert(
+            mongoTemplate.insert(
                     ticketTimesPartnerVo, TicketTimesPartnerVo.class.getSimpleName()
             );
 
-        return ticketTimesPartnerVo;
+            return ResponseDto.success(ticketTimesPartnerVo);
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get("20105"));
+        }
     }
 
     @Override
-    public TicketTimesPartnerVo addNewTimes(CreateTicketTimesParam createTicketTimesParam) {
+    public ResponseDto<TicketTimesPartnerVo> addNewTimes(CreateTicketTimesParam createTicketTimesParam) {
+        try {
             // 获取 主键id
             String ticketTimesId = IDGenerator.nextSnowId().toString();
             // 获取 当前时间 -> 创建时间
@@ -134,16 +136,24 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             ticketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
             ticketTimesPartnerVo.setType(createTicketTimesParam.getType());
             ticketTimesPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        TicketTimesPartnerVo data = mongoTemplate.insert(
+            mongoTemplate.insert(
                     ticketTimesPartnerVo, TicketTimesPartnerVo.class.getSimpleName()
             );
-        return ticketTimesPartnerVo;
+            return ResponseDto.success(ticketTimesPartnerVo);
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get("20101"));
+        }
     }
 
     @Override
-    public Boolean deleteTimes(String ticketTimesId) {
+    public ResponseDto<String> deleteTimes(String ticketTimesId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
+
+            TicketTimesPartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
+            if (data.getStatus() == 0) {
+                return ResponseDto.failure(ErrorMapping.get("20106"));
+            }
             KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
                     new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimesId));
             if (ticketTimeRelation != null) {
@@ -160,21 +170,21 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
                             object,
                             new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                     );
-                    return true;
+                    return ResponseDto.success("删除成功");
                 } else {
-                    return false;
+                    return ResponseDto.failure(ErrorMapping.get("20106"));
                 }
             } else {
                 mongoTemplate.remove(Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
-                return true;
+                return ResponseDto.success();
             }
         } catch (Exception e) {
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("20102"));
         }
     }
 
     @Override
-    public TicketTimesPartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam) {
+    public ResponseDto<TicketTimesPartnerVo> changeTimes(CreateTicketTimesParam createTicketTimesParam) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             String title = "";
@@ -200,11 +210,9 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
-
-            return JsonUtils.fromJson(doc.toJson(), TicketTimesPartnerVo.class);
-
+            return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), TicketTimesPartnerVo.class));
         } catch (Exception e) {
-            return null;
+            return ResponseDto.failure(ErrorMapping.get("20103"));
         }
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
@@ -51,9 +53,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     @Autowired
     private MongoConverter mongoConverter;
 
-    @Autowired
-    private RedisUtil redisUtil;
-
     @Autowired
     private KylinPerformanceStatusMapper performanceStatusMapper;
 
@@ -70,10 +69,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     private KylinTicketRelationsMapper ticketRelationsMapper;
 
     @Override
-    public TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam) {
-        TicketPartnerVo ticketPartnerVo = null;
+    public ResponseDto<TicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam) {
+        ResponseDto<TicketPartnerVo> ticketPartnerVo = null;
         //获取演出状态
-        TicketTimesPartnerVo timesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())),TicketTimesPartnerVo.class,TicketTimesPartnerVo.class.getSimpleName());
+        TicketTimesPartnerVo timesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
 
         if (null != timesPartnerVo) {
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
@@ -96,7 +95,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public TicketPartnerVo createTicket(TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketPartnerVo> createTicket(TicketCreateParam ticketCreateParam) {
+        try {
             // 获取 主键id
             String ticketsId = IDGenerator.nextSnowId().toString();
             // 获取 当前时间 -> 创建时间
@@ -130,11 +130,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                     ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
             );
 
-        return ticketPartnerVo;
+            return ResponseDto.success(ticketPartnerVo);
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get("20105"));
+        }
     }
 
     @Override
-    public TicketPartnerVo addNewTicket(TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketPartnerVo> addNewTicket(TicketCreateParam ticketCreateParam) {
+        try {
             // 获取 主键id
             String ticketsId = IDGenerator.nextSnowId().toString();
             // 获取 当前时间 -> 创建时间
@@ -168,11 +172,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                     ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
             );
 
-        return ticketPartnerVo;
+            return ResponseDto.success(ticketPartnerVo);
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get("20101"));
+        }
     }
 
     @Override
-    public TicketPartnerVo updateTicket(TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
         try {
             String ticketId = ticketCreateParam.getTicketsId();
             LocalDateTime updatedAt = LocalDateTime.now();
@@ -200,14 +207,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             );
 
             TicketPartnerVo ticketPartnerVoData = JsonUtils.fromJson(doc.toJson(), TicketPartnerVo.class);
-            return ticketPartnerVoData;
+            return ResponseDto.success(ticketPartnerVoData);
         } catch (Exception e) {
-            return null;
+            return ResponseDto.failure(ErrorMapping.get("20103"));
         }
     }
 
     @Override
-    public boolean deleteTicket(String ticketsId) {
+    public ResponseDto<String> deleteTicket(String ticketsId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
 
@@ -216,7 +223,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
             if (ticketRelations == null) {
                 mongoTemplate.remove(Query.query(Criteria.where("ticketsId").is(ticketsId)), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
-                return true;
+                return ResponseDto.success("删除成功");
             }
             KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
                     new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketRelations.getTimesId()));
@@ -236,18 +243,18 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                         object,
                         new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                 );
-                return true;
+                return ResponseDto.success("删除成功");
             } else {
-                return false;
+                return ResponseDto.failure(ErrorMapping.get("20106"));
             }
         } catch (Exception e) {
-            return false;
+            return ResponseDto.failure(ErrorMapping.get("20102"));
         }
     }
 
     @Override
-    public TicketPartnerVo copyTicket(String ticketsId) {
-
+    public ResponseDto<TicketPartnerVo> copyTicket(String ticketsId) {
+        try {
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
 
@@ -258,9 +265,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             TicketPartnerVo data = mongoTemplate.insert(
                     ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
             );
-
-        redisUtil.hset(KylinRedisConst.TICKET, ticketsId, ticketPartnerVo);
-        return ticketPartnerVo;
+            return ResponseDto.success(ticketPartnerVo);
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get("20107"));
+        }
     }
 
     @Override
@@ -289,7 +297,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public boolean onLine(String ticketsId) {
+    public ResponseDto<String> onLine(String ticketsId) {
+        try {
             LocalDateTime updatedAt = LocalDateTime.now();
             KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
             if (ticketStatus.getStatus() >= 3 && ticketStatus.getStatus() != 4 && ticketStatus.getStatus() != 6) {//未提审||被拒绝
@@ -319,16 +328,18 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                             ticketVo, TicketVo.class.getSimpleName()
                     );
                 }
-            //TODO 修改misVo
-
-            return true;
+                return ResponseDto.success("上线成功");
             } else {
-            return false;
+                return ResponseDto.failure(ErrorMapping.get("20110"));
+            }
+        }catch (Exception e){
+            return ResponseDto.failure(ErrorMapping.get("20108"));
         }
     }
 
     @Override
-    public boolean outLine(String ticketsId) {
+    public ResponseDto<String> outLine(String ticketsId) {
+        try {
             LocalDateTime updatedAt = LocalDateTime.now();
             KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
             if (ticketStatus.getStatus() >= 3 && ticketStatus.getStatus() != 4 && ticketStatus.getStatus() != 7) {//未提审||被拒绝
@@ -344,10 +355,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                 mongoTemplate.remove(Query.query(Criteria.where("ticketsId").is(ticketVoItem.getTicketsId())), TicketIgnoreVo.class, TicketIgnoreVo.class.getSimpleName());
                 mongoTemplate.insert(ticketIgnoreVo, TicketIgnoreVo.class.getSimpleName());
                 mongoTemplate.remove(Query.query(Criteria.where("ticketsId").is(ticketVoItem.getTicketsId())), TicketVo.class, TicketVo.class.getSimpleName());
-            //TODO 删除misVo
-            return true;
+                return ResponseDto.success("下线成功");
             } else {
-            return false;
+                return ResponseDto.failure(ErrorMapping.get("20111"));
+            }
+        }catch (Exception e){
+            return ResponseDto.failure(ErrorMapping.get("20109"));
         }
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java

@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.param.PerformanceParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
@@ -224,7 +224,7 @@ public class PerformanceVoTask {
      * @return
      */
     public PerformanceMisVo getPerformanceMisVo(String performancesId) {
-        PerformanceParam performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName());
+        PerformancePartnerVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
         List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
         List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
 
@@ -273,67 +273,6 @@ public class PerformanceVoTask {
         return performanceMisVo;
     }
 
-//    /**
-//     * 生成 PerformanceUpdatePartnerVo(用于修改审核提交数据)
-//     *
-//     * @param performancesId
-//     * @return
-//     */
-//    public PerformanceMisVo setPerformanceUpdateParam(String performancesId) {
-//        PerformanceParam performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName());
-//        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
-//        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
-//
-//        ArrayList<BigDecimal> floatList = new ArrayList<>();
-//        ArrayList<String> StringList = new ArrayList<>();
-//
-//        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
-//            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
-//            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
-//            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
-//            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
-//            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
-//            for (TicketPartnerVo ticketPartnerVoItem : ticketPartnerVos) {
-//                floatList.add(ticketPartnerVoItem.getPrice());
-//                StringList.add(ticketPartnerVoItem.getTimeEnd());
-//            }
-//        }
-//        PerformanceMisVo performanceMisVo = new PerformanceMisVo();
-//        BeanUtils.copyProperties(performanceData, performanceMisVo);
-//
-//        floatList.sort(Comparator.reverseOrder());
-//        StringList.sort(Comparator.naturalOrder());
-//
-//        performanceMisVo.setPrice(floatList.get(0) + "起");
-//        performanceMisVo.setStopSellTime(StringList.get(0));
-//        performanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-//        performanceMisVo.setStatus(1);
-//        performanceMisVo.setRejectTxt("");
-//        performanceMisVo.setAuditStatus(0);
-//        KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
-//        performanceMisVo.setStatusSell(performanceStatus.getStatusSell());
-//        performanceMisVo.setIsShow(performanceStatus.getIsShow());
-//        performanceMisVo.setIsDistribution(performanceStatus.getIsDistribution());
-//        performanceMisVo.setSyncAgent(performanceStatus.getSyncAgent());
-//
-//
-////        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceMisVo.class, PerformanceMisVo.class.getSimpleName());
-////
-////        if (!exists) {
-////            mongoTemplate.insert(
-////                    performanceMisVo, PerformanceMisVo.class.getSimpleName()
-////            );
-////        } else {
-////            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performanceMisVo));
-////            mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
-////                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
-////                    object
-////            );
-////        }
-//
-//        return performanceMisVo;
-//    }
-
     /**
      * 插入数据库
      *
@@ -432,7 +371,7 @@ public class PerformanceVoTask {
 
                     ticketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
                     ticketStatus.setTicketId(tickets.getTicketsId());
-                    ticketStatus.setCounts(1);
+//                    ticketStatus.setCounts(1);
                     ticketStatus.setIsMember(1);
                     ticketStatus.setIsExclusive(0);
                     ticketStatus.setIsTrueName(performanceStatus.getIsTrueName());
@@ -468,7 +407,7 @@ public class PerformanceVoTask {
      * @param performanceUpdateMisVo
      * @param updatedAt
      */
-    public void updatePerformanceMySql(String performancesId, HashMap<String, Object> map, PerformanceMisVo performanceUpdateMisVo, LocalDateTime updatedAt) {
+    public void updatePerformanceMySql(String performancesId, HashMap<String, Object> map, PerformanceMisVo performanceUpdateMisVo, LocalDateTime updatedAt,Integer auditStatus) {
         try {
             //创建演出
             KylinPerformances performances = new KylinPerformances();
@@ -486,7 +425,7 @@ public class PerformanceVoTask {
             performanceStatus.setPerformanceId(performances.getPerformancesId());
             performanceStatus.setPerformanceStatusId(IDGenerator.nextSnowId().toString());
             performanceStatus.setCreatedAt(null);
-            performanceStatus.setAuditStatus(0);
+            performanceStatus.setAuditStatus(auditStatus);
             performanceStatus.setUpdatedAt(updatedAt);
 
             performanceRelations.setPerformanceId(performances.getPerformancesId());
@@ -563,7 +502,7 @@ public class PerformanceVoTask {
 
                     ticketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
                     ticketStatus.setTicketId(tickets.getTicketsId());
-                    ticketStatus.setCounts(1);
+                    ticketStatus.setCounts(null);
                     ticketStatus.setIsMember(null);
                     ticketStatus.setStatusExchange(7);
                     ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime())));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

+package com.liquidnet.service.kylin.utils;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DataUtils {
+
+    @Autowired
+    private KylinBuyNoticeMapper buyNoticeMapper;
+
+    public String getBuyNoticeJsonString(List<String> buyNoticeIds){
+        List<KylinBuyNotice> data = buyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().in("buy_notice_id",buyNoticeIds));
+        return  JsonUtils.toJson(data);
+    }
+
+}

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

+#APP ERROR
+20001=验证码发送失败
+20002=验证码无效
+20003=
+20004=
+20005=手机号获取失败，请更换登录方式
+20006=第三方账号未注册
+20007=
+
+#APP PARTNER
+20101=添加失败
+20102=删除失败
+20103=修改失败
+20104=查询失败
+20105=创建失败
+20106=不可删除
+20107=复制失败
+
+20108=上线失败
+20109=下线失败
+20110=不可上线
+20111=不可下线
+20112=不可修改
+
+20113=未创建场次
+20114=有场次为创建票种
+20115=提交失败
+20116=不可撤回
+20117=撤回失败
+
+#APP JDM
+20201=
\ No newline at end of file