From f521456886299b0c24cad76abbb7520b86866ef5 Mon Sep 17 00:00:00 2001
From: monomania <szy.foggy@gamil.com>
Date: Wed, 15 Jan 2020 01:41:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8DC1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FS001BaseFaceApplication.go                 |  1 +
 foot-core/module/analy/service/C1Service.go | 48 ++++++++++++++++++---
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/FS001BaseFaceApplication.go b/FS001BaseFaceApplication.go
index acbc5de..2cee614 100644
--- a/FS001BaseFaceApplication.go
+++ b/FS001BaseFaceApplication.go
@@ -8,6 +8,7 @@ import (
 func main() {
 	//开启SQL输出
 	launch.Before_spider_baseFace()
+	launch.Spider_match(4)
 	launch.Spider_asiaLastNew(true)
 	launch.Spider_baseFace(true)
 }
diff --git a/foot-core/module/analy/service/C1Service.go b/foot-core/module/analy/service/C1Service.go
index 6644656..6ddcc4a 100644
--- a/foot-core/module/analy/service/C1Service.go
+++ b/foot-core/module/analy/service/C1Service.go
@@ -87,7 +87,8 @@ func (this *C1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
 	//声明使用变量
 	var a18betData *entity3.AsiaLast
 	//亚赔
-	aList := this.AsiaLastService.FindByMatchIdCompId(matchId, "澳门")
+	//aList := this.AsiaLastService.FindByMatchIdCompId(matchId, "澳门")
+	aList := this.AsiaLastService.FindByMatchIdCompId(matchId, "Bet365")
 	if len(aList) < 1 {
 		return -1, nil
 	}
@@ -188,11 +189,24 @@ func (this *C1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
 		letBall += 0.075
 	}
 
-	var mainLetball bool
+	//判断主队是否是让球方
+	mainLetball := true
 	if a18betData.ELetBall > 0 {
 		mainLetball = true
-	} else {
+	} else if a18betData.ELetBall < 0 {
 		mainLetball = false
+	} else {
+		if a18betData.SLetBall > 0 {
+			mainLetball = true
+		} else if a18betData.SLetBall < 0 {
+			mainLetball = false
+		} else {
+			if letBall >= 0 {
+				mainLetball = true
+			} else {
+				mainLetball = false
+			}
+		}
 	}
 
 	if a18betData.ELetBall > 0 && letBall < 0 {
@@ -203,9 +217,23 @@ func (this *C1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
 		sLetBall := math.Abs(a18betData.SLetBall)
 		eLetBall := math.Abs(a18betData.ELetBall)
 		tLetBall := math.Abs(letBall)
+		ableUpDown := false
+		if math.Abs(sLetBall-eLetBall) <= 0.25 {
+			ableUpDown = true
+		}
 
 		if (sLetBall >= tLetBall && eLetBall >= tLetBall) || (sLetBall < tLetBall && eLetBall >= tLetBall) {
-			if math.Abs(eLetBall-tLetBall) < 0.26 {
+			var seLetBall float64
+			if ableUpDown {
+				if sLetBall > eLetBall {
+					seLetBall = eLetBall
+				} else {
+					seLetBall = sLetBall
+				}
+			}else{
+				seLetBall = eLetBall
+			}
+			if math.Abs(seLetBall-tLetBall) <= 0.25 {
 				if mainLetball {
 					preResult = 3
 				} else {
@@ -219,7 +247,17 @@ func (this *C1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
 				}
 			}
 		} else if (sLetBall < tLetBall && eLetBall < tLetBall) || (sLetBall >= tLetBall && eLetBall < tLetBall) {
-			if math.Abs(tLetBall-eLetBall) < 0.26 {
+			var seLetBall float64
+			if ableUpDown {
+				if sLetBall > eLetBall {
+					seLetBall = sLetBall
+				} else {
+					seLetBall = eLetBall
+				}
+			}else{
+				seLetBall = eLetBall
+			}
+			if math.Abs(tLetBall-seLetBall) <= 0.25 {
 				if mainLetball {
 					preResult = 3
 				} else {
-- 
GitLab