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/vo/partner/KylinPerformanceMisVo.java

@@ -134,6 +134,9 @@ public class KylinPerformanceMisVo implements Cloneable{
     @ApiModelProperty(value = "场次数据")
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
 
+    @ApiModelProperty(value = "是否同步大麦", example = "0")
+    private Integer isSyncDamai;
+
     private static final KylinPerformanceMisVo obj = new KylinPerformanceMisVo();
     public static KylinPerformanceMisVo getNew() {
         try {

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

@@ -294,6 +294,7 @@ public class PerformanceUtils {
             } else {
                 performanceStatus.setStatusSell(1);
             }
+            performanceStatus.setIsSyncDamai(kylinPerformanceMisVo.getIsSyncDamai());
 
             performanceRelations.setPerformanceId(performances.getPerformancesId());
             performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId());

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

@@ -54,7 +54,7 @@ kylin_performance_status.del=DELETE FROM kylin_performance_status WHERE performa
 kylin_performance_relations.del=DELETE FROM kylin_performance_relations WHERE performance_id = ?
 #province_id,province_name,district_id,district_name
 kylin_performances.insert=INSERT INTO kylin_performances (performances_id,title,type,img_poster,city_id,city_name,approval_url,notice,sponsor_id,sponsor_type,sponsor,contacts,mobile,describes,details,notice_image,time_start,time_end,sort,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,id_count,limit_count_member,field_audit_status,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,id_count,limit_count_member,field_audit_status,created_at,updated_at,is_sync_damai) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_performance_relations.insert=INSERT INTO kylin_performance_relations (performance_relations_id,performance_id,copy_id,merchant_id,field_id,road_show_id,project_id,video_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
 
 kylin_ticket_times.del=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?