增加一个时间

server/models/GamesPs.js

@@ -835,8 +835,8 @@ const getGamesRelation = ({
         tempRel[platform] = gameInfo;
       }
       if (listOdds) {
-        const { odds, evExpire, spExpire } = extractOdds({ platform, evtime, events, sptime, special });
-        tempRel[platform] = { ...tempRel[platform], odds, evExpire, spExpire };
+        const { odds, evtime, evExpire, spExpire } = extractOdds({ platform, evtime, events, sptime, special });
+        tempRel[platform] = { ...tempRel[platform], odds, evtime, evExpire, spExpire };
       }
     });
     return { ...relationInfo, rel: tempRel };

server/triangle/trangleCalc.js

@@ -33,11 +33,11 @@ const getOptimalSelections = (odds, rules) => {
             isValid = false;
             break;
           }
-          const { v, r, s, q, b, t } = item['ps'];
           selection.push([{
-            k: key, p: 'ps',
-            v, r, s, q, b, t,
-            o: item
+            k: key,
+            p: 'ps',
+            o: item,
+            ...item['ps'],
           }]);
         }
         else {
@@ -47,14 +47,12 @@ const getOptimalSelections = (odds, rules) => {
             isValid = false;
             break;
           }
-          selection.push(candidates.map(k => {
-            const { v, r, s, q, b, t } = item[k];
-            return {
-              k: key, p: k,
-              v, r, s, q, b, t,
-              o: item
-            };
-          }));
+          selection.push(candidates.map(k => ({
+            k: key,
+            p: k,
+            o: item,
+            ...item[k],
+          })));
         }
       }
 
@@ -148,6 +146,7 @@ const extractOdds = ({ platform, evtime, events, sptime, special }) => {
     odds: null,
     evExpire: false,
     spExpire: false,
+    evtime: 0,
     removeCount: 0,
   }
   let odds = {};
@@ -173,6 +172,7 @@ const extractOdds = ({ platform, evtime, events, sptime, special }) => {
     }
   });
   extractData.odds = odds;
+  extractData.evtime = Math.max(evtime, sptime);
   return extractData;
 }