1.增加推送时间

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

@@ -7,6 +7,8 @@ CREATE TABLE `kylin_performance_subscribe` (
                                                `type` tinyint(2) DEFAULT '0' COMMENT '推送类型 0 开票提醒 ',
                                                `device_tokens` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '推送设备唯一标识',
                                                `push_range` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '推送设备 ios android',
+                                               `push_time` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '推送时间',
+                                               `is_push` tinyint(2) DEFAULT '0' COMMENT '是否推送 0 未推送 1推送',
                                                `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
                                                `updated_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
                                                PRIMARY KEY (`mid`),

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

@@ -867,21 +867,22 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             // 避免重复预约
             Integer performanceSubscribe = dataUtils.getPerformanceSubscribe(uid, param.getPerformancesId(), param.getTicketTimesId());
             if (performanceSubscribe != 1) {
+            // 计算过期时间 演出结束时间-当前时间
+            long expirationTime = DateUtil.intervalSeconds(DateUtil.parse(DateUtil.format(param.getTimeEnd(), DateUtil.Formatter.yyyyMMddHHmmss), DateUtil.DATE_FULL_STR), DateUtil.now());
+            // 计算通知时间 演出开始时间-10分钟
+            LocalDateTime timeStart = param.getTimeStart();
+            LocalDateTime localDateTime = timeStart.minusMinutes(10);
+            String pushTime = DateUtil.format(localDateTime, DateUtil.Formatter.yyyyMMddHHmmss);
             // 记录预约信息
             queueUtils.sendMsgByRedis(
                     MQConst.KylinQueue.SQL_PERFORMANCE_SUBSCRIBE.getKey(),
                     SqlMapping.get(
                             "kylin_performance_subscribe.insert",
                             new Object[]{
-                                    param.getPerformancesId(), param.getTicketTimesId(), param.getTicketsId(), uid,KylinTableStatusConst.SubscribeTypeEnum.TYPE1.getKey(),param.getDeviceTokens(),source
+                                    param.getPerformancesId(), param.getTicketTimesId(), param.getTicketsId(), uid,KylinTableStatusConst.SubscribeTypeEnum.TYPE1.getKey(),param.getDeviceTokens(),
+                                    source,pushTime
                             }
             ));
-            // 计算过期时间 演出结束时间-当前时间
-            long expirationTime = DateUtil.intervalSeconds(DateUtil.parse(DateUtil.format(param.getTimeEnd(), DateUtil.Formatter.yyyyMMddHHmmss), DateUtil.DATE_FULL_STR), DateUtil.now());
-            // 计算通知时间 演出开始时间-10分钟
-            LocalDateTime timeStart = param.getTimeStart();
-            LocalDateTime localDateTime = timeStart.minusMinutes(10);
-            String pushTime = DateUtil.format(localDateTime, DateUtil.Formatter.yyyyMMddHHmmss);
             // 演出预约
             dataUtils.setPerformanceSubscribe(uid, param.getPerformancesId(), param.getTicketTimesId(), expirationTime);
             //redis 用户开票提醒列表

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

@@ -41,4 +41,4 @@ kylin_ar_ticket.update =update kylin_ticket_active set state=?,redeem_uid= ?,red
 
 kylin_order_ticket_entities.update_status_bystation_pad=UPDATE kylin_order_ticket_entities SET `status`=?,check_client=?,updated_at=?, comment=? WHERE order_ticket_entities_id=?
 # ------------------------ \u6F14\u51FA\u9884\u7EA6 ----------------------------
-kylin_performance_subscribe.insert=INSERT INTO kylin_performance_subscribe(performance_id,ticket_times_id,tickets_id,user_id,type,device_tokens,push_range)VALUES(?,?,?,?,?,?,?)
+kylin_performance_subscribe.insert=INSERT INTO kylin_performance_subscribe(performance_id,ticket_times_id,tickets_id,user_id,type,device_tokens,push_range,push_time)VALUES(?,?,?,?,?,?,?,?)
\ No newline at end of file