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

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

@@ -585,8 +585,8 @@ WHERE kotr.performance_id = #{performanceId}
                otr.is_member,
                ots.transfer_status,
                CASE
-                   WHEN ote.is_payment = 1 AND ote.is_damai_push_synced = 0 THEN 1
-                   WHEN (ote.is_payment IN (2, 3) OR ots.transfer_status IN (2, 6)) AND ote.is_damai_withdraw_synced = 0 THEN 2
+                   WHEN ote.is_payment = 1 AND ote.is_damai_push_synced IN (0, 3) THEN 1
+                   WHEN (ote.is_payment IN (2, 3) OR ots.transfer_status IN (2, 6)) AND ote.is_damai_withdraw_synced IN (0, 3) THEN 2
                END AS sync_type
         FROM kylin_order_ticket_entities ote
         LEFT JOIN kylin_order_tickets ot ON ote.order_id = ot.order_tickets_id
@@ -594,9 +594,9 @@ WHERE kotr.performance_id = #{performanceId}
         LEFT JOIN kylin_order_ticket_status ots ON ots.order_id = ot.order_tickets_id
         WHERE ote.performance_id = #{performanceId}
           AND (
-              (ote.is_payment = 1 AND ote.is_damai_push_synced = 0)
+              (ote.is_payment = 1 AND ote.is_damai_push_synced IN (0, 3))
               OR
-              ((ote.is_payment IN (2, 3) OR ots.transfer_status IN (2, 6)) AND ote.is_damai_withdraw_synced = 0)
+              ((ote.is_payment IN (2, 3) OR ots.transfer_status IN (2, 6)) AND ote.is_damai_withdraw_synced IN (0, 3))
           )
         LIMIT 200
     </select>

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

@@ -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(), performanceId, now, now
+                            performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(),step2Param.getIdCount(), step2Param.getIsSyncDamai(), 0, performanceId, now, now
                     });
                     redisSlimeUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
 

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 =? 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 =?,is_damai_basic_synced=? 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    ----