feats

src/util/FootballPrice.js

@@ -15,14 +15,13 @@ const playWayFunc = {
 }
 
 // 遍历模拟比赛获取最大, 最小奖金
-// rq 让球数
-export function GetPrice (allParts, rq) {
+export function GetPrice (allParts) {
   let minPrice
   let maxPrice
 
   // 遍历模拟比赛的各种可能
   matches.forEach(match => {
-    const [min, max] = GetMinAndMax(allParts, match, rq)
+    const [min, max] = GetMinAndMax(allParts, match)
     if (min < minPrice || minPrice === undefined) {
       minPrice = min
     }
@@ -35,7 +34,7 @@ export function GetPrice (allParts, rq) {
   return [minPrice, maxPrice]
 }
 
-function GetMinAndMax (allParts, match, rq) {
+function GetMinAndMax (allParts, match) {
   let minPrice = 0
   let maxPrice = 0
 
@@ -45,9 +44,10 @@ function GetMinAndMax (allParts, match, rq) {
     const price = parts.map(part => {
       // 场次组合 比如 2串1
       return part.map(grp => {
-        const { wayCode } = grp.rules
+        const { detail, spreadPoints } = grp
+        const { wayCode } = detail
         const fn = playWayFunc[wayCode]
-        return fn(grp, match, rq)
+        return fn(grp, match, spreadPoints)
       }).filter(Boolean).reduce((acc, x) => acc * x, 1)
     }).reduce((acc, x) => acc + x, 0)
 
@@ -79,7 +79,7 @@ function computeWDL (part, match, rq) {
 // 让球胜平负
 function computeWDLS (part, match, rq) {
   const [x, y] = match
-  const { ruleCode, odds } = part.rules
+  const { ruleCode, odds } = part.detail
 
   switch (ruleCode) {
     case 'ft-sp-win':
@@ -94,7 +94,7 @@ function computeWDLS (part, match, rq) {
 // 比分
 function computeScore (part, match, rq) {
   const [x, y] = match
-  const { ruleCode, odds } = part.rules
+  const { ruleCode, odds } = part.detail
 
   switch (ruleCode) {
     case 'ft-w10':
@@ -165,7 +165,7 @@ function computeScore (part, match, rq) {
 // 进球数
 function computePoints (part, match, rq) {
   const [x, y] = match
-  const { ruleCode, odds } = part.rules
+  const { ruleCode, odds } = part.detail
 
   switch (ruleCode) {
     case 'ft-p0':
@@ -190,7 +190,7 @@ function computePoints (part, match, rq) {
 // 半全场
 function computeDouble (part, match, rq) {
   const [x, y] = match
-  const { ruleCode, odds } = part.rules
+  const { ruleCode, odds } = part.detail
 
   switch (ruleCode) {
     case 'ft-ww':