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,9 +73,6 @@ 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/param/PerformanceStep2Param.java

@@ -54,9 +54,6 @@ public class PerformanceStep2Param implements Serializable,Cloneable {
     @NotNull(message = "须知提醒不能为空")
     private Integer noticeRemindStatus;
 
-    @ApiModelProperty(value = "是否开启大麦同步 0:关闭 1:开启", example = "0")
-    private Integer isSyncDamai;
-
     private static final PerformanceStep2Param obj = new PerformanceStep2Param();
     public static PerformanceStep2Param getNew() {
         try {

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

@@ -87,8 +87,6 @@ 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-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinPerformanceMisVo.java

@@ -134,9 +134,6 @@ 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-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/damai.html

@@ -37,36 +37,36 @@
                 </div>
             </div>
         </div>
-        <div th:each="tickets : ${kylinPerformanceDamaiVo.damaiTickets}">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">票种名称：</label>
-                <div class="col-sm-8">
-                    <input name="title" th:value="${tickets.title}" class="form-control" type="text" readonly>
-                    <input name="ticketsId" th:value="${tickets.ticketsId}" class="form-control" type="hidden" required>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">是否同步：</label>
-                <div class="col-sm-8" th:if="${tickets.syncDamai==1}">
-                    <div class="radio check-box">
-                        <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}"
-                               checked>同步</label>
-                    </div>
-                    <div class="radio check-box">
-                        <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">不同步</label>
-                    </div>
-                </div>
-                <div class="col-sm-8" th:if="${tickets.syncDamai==0}">
-                    <div class="radio check-box">
-                        <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">同步</label>
-                    </div>
-                    <div class="radio check-box">
-                        <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}" checked>
-                        不同步</label>
-                    </div>
-                </div>
-            </div>
-        </div>
+<!--        <div th:each="tickets : ${kylinPerformanceDamaiVo.damaiTickets}">-->
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-3 control-label is-required">票种名称：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input name="title" th:value="${tickets.title}" class="form-control" type="text" readonly>-->
+<!--                    <input name="ticketsId" th:value="${tickets.ticketsId}" class="form-control" type="hidden" required>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-3 control-label is-required">是否同步：</label>-->
+<!--                <div class="col-sm-8" th:if="${tickets.syncDamai==1}">-->
+<!--                    <div class="radio check-box">-->
+<!--                        <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}"-->
+<!--                               checked>同步</label>-->
+<!--                    </div>-->
+<!--                    <div class="radio check-box">-->
+<!--                        <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">不同步</label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="col-sm-8" th:if="${tickets.syncDamai==0}">-->
+<!--                    <div class="radio check-box">-->
+<!--                        <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">同步</label>-->
+<!--                    </div>-->
+<!--                    <div class="radio check-box">-->
+<!--                        <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}" checked>-->
+<!--                        不同步</label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
 
         <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
             修改
@@ -89,15 +89,15 @@
             status: parseInt($("input[name^='performance_sync_damai']:checked").val())
         }
         paramList.push(param)
-        var ticketObj = JSON.parse('[[${kylinPerformanceDamaiVo.damaiTickets}]]');
-        $.each(ticketObj, function (i, damaiTickets) {
-            var param = {
-                id:damaiTickets.ticketsId,
-                type:"ticket",
-                status:parseInt($("input[name^='ticket_syncDamai:"+damaiTickets.ticketsId+"']:checked").val())
-            }
-            paramList.push(param)
-        });
+        // var ticketObj = JSON.parse('[[${kylinPerformanceDamaiVo.damaiTickets}]]');
+        // $.each(ticketObj, function (i, damaiTickets) {
+        //     var param = {
+        //         id:damaiTickets.ticketsId,
+        //         type:"ticket",
+        //         status:parseInt($("input[name^='ticket_syncDamai:"+damaiTickets.ticketsId+"']:checked").val())
+        //     }
+        //     paramList.push(param)
+        // });
 
         $.operate.post(prefix + "/damai/change",
             {params:JSON.stringify(paramList)},

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html

@@ -156,9 +156,9 @@
                         } else {
                             actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
                         }
-                        if (row.syncDamai == 1) {
-                            actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
-                        }
+                        // if (row.syncDamai == 1) {
+                        //     actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
+                        // }
                         return actions.join('');
                     }
                 }]

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

@@ -160,12 +160,13 @@ public class KylinPerformanceStatus implements Serializable  ,Cloneable{
      */
     private Integer fieldAuditStatus;
 
-    /** 是否开启大麦同步 0:关闭 1:开启 */
-    private Integer isSyncDamai;
-
-    /** 该演出的场地场次票种基础信息是否已推过大麦 0否 1是 */
+    /**
+     * 该演出的场地场次票种基础信息是否已推过大麦 0否 1是
+     */
     private Integer isDamaiBasicSynced;
 
+ 
+
     /**
      * 创建时间
      */

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

@@ -1331,8 +1331,9 @@ GROUP BY user_mobile,tickets_id;
         SELECT kps.performance_id, kps.is_damai_basic_synced
         FROM kylin_performance_status kps
         LEFT JOIN kylin_performances kp ON kp.performances_id = kps.performance_id
-        WHERE kps.is_sync_damai = 1
-          AND kps.status IN (3, 6, 7, 8, 9, 10)
+        WHERE 1=1
+          AND kps.sync_damai = 1
+--           AND kps.status IN (3, 6, 7, 8, 9, 10)
           AND kp.time_end > NOW()
     </select>
 

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

 -- 1. 商演同步大麦开关设计及防复推
 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是';
 
 -- 2. 入场人基本门票粒度的分离式同步流转追踪设计

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

@@ -256,7 +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);
@@ -353,7 +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());
@@ -398,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(), step2Param.getIsSyncDamai(), 0, performanceId, now, now
+                            performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(),step2Param.getIdCount(), performanceId, now, now
                     });
                     redisSlimeUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
 
@@ -486,7 +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/java/com/liquidnet/service/slime/util/PerformanceUtils.java

@@ -294,7 +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

@@ -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 =?,is_sync_damai =?,is_damai_basic_synced=? 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 =? 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    ----
@@ -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,is_sync_damai) 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_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 = ?