日志更新

server/models/GamesPs.js

@@ -716,14 +716,44 @@ const updateSolutions = (solutions, eventsLogsMap) => {
       }
     });
 
+    syncSolutions(solutionUpdate);
+
     if (updateIds.add.length / solutions.length > 0.25 ||
       updateIds.remove.length / solutions.length > 0.25
     ) {
-      Logs.out('invalid events, expire %d, remove %d, no ps %d',
-        eventsLogsMap.expireEvents.length,
-        eventsLogsMap.removeEvents.length,
-        eventsLogsMap.noPsRelations.length,
-      );
+      const { expireEvents, removeEvents } = eventsLogsMap;
+      const expireEvemtsMap = {};
+
+      expireEvents.forEach(item => {
+        const { mk, platform, info, evExpire, spExpire, evtime, sptime } = item;
+        if (!expireEvemtsMap[mk]) {
+          expireEvemtsMap[mk] = {};
+        }
+        if (!expireEvemtsMap[mk][platform]) {
+          expireEvemtsMap[mk][platform] = {};
+        }
+        if (!expireEvemtsMap[mk][platform].list) {
+          expireEvemtsMap[mk][platform].list = [];
+        }
+        if (!expireEvemtsMap[mk][platform].evtime) {
+          expireEvemtsMap[mk][platform].evtime = evtime;
+        }
+        if (!expireEvemtsMap[mk][platform].sptime) {
+          expireEvemtsMap[mk][platform].sptime = sptime;
+        }
+        expireEvemtsMap[mk][platform].list.push({ info, evExpire, spExpire, evtime, sptime });
+      });
+
+      Object.keys(expireEvemtsMap).forEach(mk => {
+        Object.keys(expireEvemtsMap[mk]).forEach(platform => {
+          Logs.out('invalid events, mk %d, platform %s, expire %d, evtime %d, sptime %d',
+            mk, platform,
+            expireEvemtsMap[mk][platform].list.length,
+            expireEvemtsMap[mk][platform].evtime,
+            expireEvemtsMap[mk][platform].sptime,
+          )
+        });
+      });
 
       Logs.out('solutions add %d, update %d, retain %d, remove %d',
         updateIds.add.length, updateIds.update.length, updateIds.retain.length, updateIds.remove.length);
@@ -732,8 +762,6 @@ const updateSolutions = (solutions, eventsLogsMap) => {
       Logs.outDev('solutions update complete');
     }
 
-    syncSolutions(solutionUpdate);
-
   }
 }
 

server/triangle/eventsMatch.js

@@ -126,25 +126,14 @@ const eventMatch = () => {
     /** 日志 盘口信息 */
     const eventsLogsMap = {
       expireEvents: [],
-      removeEvents: [],
-      noPsRelations: [],
+      removeEvents: []
     };
     /** 日志 End */
 
-    const passableEvents = relations.map(({ id, rel }) => {
+    const passableEvents = relations.map(({ id, rel, mk }) => {
       const eventsMap = {};
       const oddsMap = {};
 
-      /** 日志 没有ps关系 */
-      if (!rel.hasOwnProperty('ps')) {
-        eventsLogsMap.noPsRelations.push({
-          rel,
-          noPs: true,
-        });
-        return;
-      }
-      /** 日志 End */
-
       Object.keys(rel).forEach(platform => {
         const { leagueName, teamHomeName, teamAwayName, timestamp, stage, score, evtime, events, sptime, special } = rel[platform];
         if (!events && !special) {
@@ -158,17 +147,17 @@ const eventMatch = () => {
         /** 日志 盘口过期 */
         if (evExpire || spExpire) {
           eventsLogsMap.expireEvents.push({
-            rel,
-            platform,
-            evExpire,
-            spExpire,
+            mk, platform,
+            info: rel[platform],
+            evExpire, spExpire,
+            evtime, sptime,
           });
         }
         /** 日志 盘口移除 */
         if (removeCount) {
           eventsLogsMap.removeEvents.push({
-            rel,
-            platform,
+            mk, platform,
+            info: rel[platform],
             removeCount,
           });
         }