Merge branch 'refs/heads/jxl-260205-damai' into container-test

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

@@ -73,6 +73,9 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "是否实名", example = "0")
     private Integer isTrueName;
 
+    @ApiModelProperty(value = "是否同步大麦", example = "0")
+    private Integer isSyncDamai;
+
     @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
     private Integer limitCount;
 

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

@@ -87,6 +87,8 @@ public class  KylinPerformanceVo implements Serializable, Cloneable {
     private Integer isLackRegister;
     @ApiModelProperty(value = "是否实名")
     private Integer isTrueName;
+    @ApiModelProperty(value = "是否同步大麦")
+    private Integer isSyncDamai;
     @ApiModelProperty(value = "限购张数")
     private Integer limitCount;
     @ApiModelProperty(value = "实名数量 0为不限购")

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/docu/damai_sync_migration.sql

 -- 1. 商演同步大麦开关设计及防复推
-ALTER TABLE `kylin_performances` 
+ALTER TABLE `kylin_performance_status`
 ADD COLUMN `is_sync_damai` tinyint(2) DEFAULT 0 COMMENT '是否开启大麦同步 0:关闭 1:开启',
 ADD COLUMN `is_damai_basic_synced` tinyint(2) DEFAULT 0 COMMENT '该演出的场地场次票种基础信息是否已推过大麦 0否 1是';
 

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

@@ -256,6 +256,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setIsTrueName(step2Param.getIsTrueName());
             performancePartnerVo.setLimitCount(step2Param.getLimitCount());
             performancePartnerVo.setIdCount(step2Param.getIdCount());
+            performancePartnerVo.setIsSyncDamai(step2Param.getIsSyncDamai());
             performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
 //            performancePartnerVo.setStatusSell(1);
@@ -352,6 +353,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setIsTrueName(step2Param.getIsTrueName());
             performancePartnerVo.setLimitCount(step2Param.getLimitCount());
             performancePartnerVo.setIdCount(step2Param.getIdCount());
+            performancePartnerVo.setIsSyncDamai(step2Param.getIsSyncDamai());
             performancePartnerVo.setCreatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setUpdatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
@@ -396,7 +398,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                             now, kylinPerformanceMisVo.getNoticeImage(), performanceId, now, now
                     });
                     sqlsDataB.add(new Object[]{
-                            performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(),step2Param.getIdCount(), performanceId, now, now
+                            performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(),step2Param.getIdCount(), step2Param.getIsSyncDamai(), performanceId, now, now
                     });
                     redisSlimeUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
 
@@ -484,6 +486,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                     vo.setIsTrueName(step2Param.getIsTrueName());
                     vo.setLimitCount(step2Param.getLimitCount());
                     vo.setIdCount(step2Param.getIdCount());
+                    vo.setIsSyncDamai(step2Param.getIsSyncDamai());
                     mongoSlimeUtils.updateKylinPerformanceVoById(vo);
                     redisSlimeUtils.delPerformanceVo(performanceId);
 

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/resources/sqlmap.properties

@@ -42,7 +42,7 @@ kylin_performances_reject_txt.fieldsStatus = UPDATE kylin_performances SET rejec
 
 #  ----    \u6F14\u51FA\u7B2C\u4E8C\u6B65\u9AA4\u64CD\u4F5C    ----
 kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ?,id_count =? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ?,id_count =?,is_sync_damai =? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? ,price = ?, viewers_number = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_ticket_status.updateStep2=UPDATE kylin_ticket_status SET total_exchange = ? , total_general = ? , is_true_name = ? , limit_count = ? ,id_count =? , is_lack_register = ? , is_express = ? , is_electronic = ? ,counts = ? , is_show_code = ? ,qr_code_show_time = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #  ----    VoStatus    ----