diff --git a/assets/wechat/html/month.html b/assets/wechat/html/month.html index f091ca1ee12439bbb254c9289ab86da33c4fed9c..5ebebca5e43be4bf7a8be5c733001a6cce91fda6 100644 --- a/assets/wechat/html/month.html +++ b/assets/wechat/html/month.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/month_c1.html b/assets/wechat/html/month_c1.html index a905cad823804129dcba76c703b4090a17d922a5..318f5772be8638e3970e313ce729d17af864b15c 100644 --- a/assets/wechat/html/month_c1.html +++ b/assets/wechat/html/month_c1.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/month_c2.html b/assets/wechat/html/month_c2.html index f091ca1ee12439bbb254c9289ab86da33c4fed9c..5ebebca5e43be4bf7a8be5c733001a6cce91fda6 100644 --- a/assets/wechat/html/month_c2.html +++ b/assets/wechat/html/month_c2.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/month_guts.html b/assets/wechat/html/month_guts.html index 2276855d09c4f4d5977041c4e4f4a805613736d3..b7cf9738738e49d287110740ac59809ea21799df 100644 --- a/assets/wechat/html/month_guts.html +++ b/assets/wechat/html/month_guts.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/today_c1.html b/assets/wechat/html/today_c1.html index 714df9874cf6e8cfa56bae06e3a8279d512497bc..8fe014ddb944d1e262924fd94901e52063c89c54 100644 --- a/assets/wechat/html/today_c1.html +++ b/assets/wechat/html/today_c1.html @@ -49,7 +49,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{if .DataList}} {{with .DataList}} diff --git a/assets/wechat/html/today_c2.html b/assets/wechat/html/today_c2.html index 714df9874cf6e8cfa56bae06e3a8279d512497bc..8fe014ddb944d1e262924fd94901e52063c89c54 100644 --- a/assets/wechat/html/today_c2.html +++ b/assets/wechat/html/today_c2.html @@ -49,7 +49,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{if .DataList}} {{with .DataList}} diff --git a/assets/wechat/html/today_guts.html b/assets/wechat/html/today_guts.html index 36a749030b5d6895fb0ca6e0efd0621acb88066a..83a04ef9ae17b76adac20fea62459bf96578ec7e 100644 --- a/assets/wechat/html/today_guts.html +++ b/assets/wechat/html/today_guts.html @@ -49,7 +49,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{if .DataList}} {{with .DataList}} diff --git a/assets/wechat/html/today_guts_c1e2.html b/assets/wechat/html/today_guts_c1e2.html index 36a749030b5d6895fb0ca6e0efd0621acb88066a..83a04ef9ae17b76adac20fea62459bf96578ec7e 100644 --- a/assets/wechat/html/today_guts_c1e2.html +++ b/assets/wechat/html/today_guts_c1e2.html @@ -49,7 +49,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{if .DataList}} {{with .DataList}} diff --git a/assets/wechat/html/today_guts_c2e2.html b/assets/wechat/html/today_guts_c2e2.html index 257c21cf1487f1a0e3d408977d1a7d2fd5d157c9..3ac07b8f2f82f9f176b6ea3dde22cdc5d2c61887 100644 --- a/assets/wechat/html/today_guts_c2e2.html +++ b/assets/wechat/html/today_guts_c2e2.html @@ -49,7 +49,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{if .DataList}} {{with .DataList}} diff --git a/assets/wechat/html/today_tbs.html b/assets/wechat/html/today_tbs.html index 2f240d61c68d2324cb6756a0c818bb1edc8c2f70..a473736fa0634fb0c77dffb8a1c9495a5cdfcc02 100644 --- a/assets/wechat/html/today_tbs.html +++ b/assets/wechat/html/today_tbs.html @@ -47,7 +47,7 @@ 主队(让球)客队 比分 推荐 - 指数/Desc + 指数/Desc {{if .DataList}} {{with .DataList}} diff --git a/assets/wechat/html/week.html b/assets/wechat/html/week.html index fe93889c17da63ed4f0eb7a3a34ce7671093a8fd..2b25880823762412b9b29712e8d3f3038b4df00b 100644 --- a/assets/wechat/html/week.html +++ b/assets/wechat/html/week.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/week_c1.html b/assets/wechat/html/week_c1.html index 7c3219b9ddefb50dae09237dfa470970dcab0369..79920d023011ed3ec37bb603d1a6e6f8132ef734 100644 --- a/assets/wechat/html/week_c1.html +++ b/assets/wechat/html/week_c1.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/week_c2.html b/assets/wechat/html/week_c2.html index fe93889c17da63ed4f0eb7a3a34ce7671093a8fd..2b25880823762412b9b29712e8d3f3038b4df00b 100644 --- a/assets/wechat/html/week_c2.html +++ b/assets/wechat/html/week_c2.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/assets/wechat/html/week_guts.html b/assets/wechat/html/week_guts.html index 2276855d09c4f4d5977041c4e4f4a805613736d3..b7cf9738738e49d287110740ac59809ea21799df 100644 --- a/assets/wechat/html/week_guts.html +++ b/assets/wechat/html/week_guts.html @@ -31,7 +31,7 @@ 主队(让球)客队 比分 推荐 - BF让球 + BF让球 {{with .DataList}} {{range .}} diff --git a/foot-core/module/analy/service/C4Service.go b/foot-core/module/analy/service/C4Service.go index 952ef44b6100eb2388d489cb89c8edd58c7f7c76..6c051d904c804d97d28084a848d16c2392a14521 100644 --- a/foot-core/module/analy/service/C4Service.go +++ b/foot-core/module/analy/service/C4Service.go @@ -3,6 +3,7 @@ package service import ( "fmt" "math" + "strconv" "strings" "tesou.io/platform/foot-parent/foot-api/common/base" pojo2 "tesou.io/platform/foot-parent/foot-api/common/base/pojo" @@ -81,7 +82,6 @@ func (this *C4Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult) mainJinList := make([]*pojo.BFJin, 0) err1 := this.BFJinService.PageSql("SELECT j.* FROM foot.t_b_f_jin j WHERE j.SclassID = "+v.LeagueId+" AND (j.HomeTeam = '"+v.MainTeamId+"' OR j.GuestTeam = '"+v.MainTeamId+"') AND STR_TO_DATE(j.MatchTimeStr, '%Y%m%d%H%i%s') < '"+matchDateStr+"' ORDER BY j.MatchTimeStr DESC ", page, &mainJinList) if nil != err1 { - base.Log.Error(err1) return -2, temp_data } @@ -152,8 +152,8 @@ func (this *C4Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult) preResult = 0 } } else { - temp_data.TOVoidDesc = "Turn" - temp_data.PreResult = -1 + preResult = -1 + temp_data.TOVoidDesc = "None" } } if eLetBall < 0 { @@ -166,61 +166,52 @@ func (this *C4Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult) preResult = 3 } } else { - temp_data.TOVoidDesc = "Turn" - temp_data.PreResult = -1 + preResult = -1 + temp_data.TOVoidDesc = "None" } } + if v.Id == "1865711" { + fmt.Println("-------------") + } + + temp_data.MatchId = v.Id + temp_data.MatchDate = v.MatchDate + temp_data.SLetBall = a18Bet.SLetBall + temp_data.LetBall = a18Bet.ELetBall + temp_data.Desc = fmt.Sprintf("S:%v,G:%v", diffScore, diffGoal) + temp_data.AlFlag = this.ModelName() + format := time.Now().Format("0102150405") + temp_data.AlSeq = format + temp_data.PreResult = preResult + + //限制初盘,即时盘让球在0.25以内 + range_letball := math.Abs(a18Bet.SLetBall - a18Bet.ELetBall) + if (a18Bet.SLetBall > 0 && a18Bet.ELetBall < 0) || (a18Bet.SLetBall < 0 && a18Bet.ELetBall > 0) { + temp_data.TOVoidDesc = fmt.Sprintf("Turn:%v,%v,%v", strconv.FormatFloat(range_letball, 'f', -1, 64), strconv.FormatFloat(a18Bet.SLetBall, 'f', -1, 64), strconv.FormatFloat(a18Bet.ELetBall, 'f', -1, 64)) + temp_data.PreResult = -1 + temp_data.HitCount = 3 + return -2, temp_data + } + if math.Abs(a18Bet.SLetBall-a18Bet.ELetBall) > 0.25 { + temp_data.TOVoidDesc = fmt.Sprintf("Change:%v,%v,%v", strconv.FormatFloat(range_letball, 'f', -1, 64), strconv.FormatFloat(a18Bet.SLetBall, 'f', -1, 64), strconv.FormatFloat(a18Bet.ELetBall, 'f', -1, 64)) + temp_data.PreResult = -1 + temp_data.HitCount = 3 + return -2, temp_data + } if preResult < 0 { - temp_data.MatchId = v.Id - temp_data.MatchDate = v.MatchDate - temp_data.SLetBall = a18Bet.SLetBall - temp_data.LetBall = a18Bet.ELetBall - temp_data.Desc = fmt.Sprintf("分差:%v ,球差:%v", diffScore, diffGoal) - temp_data.AlFlag = this.ModelName() - format := time.Now().Format("0102150405") - temp_data.AlSeq = format - temp_data.PreResult = preResult temp_data.HitCount = 3 - - //限制初盘,即时盘让球在0.25以内 - if math.Abs(a18Bet.SLetBall-a18Bet.ELetBall) > 0.25 { - //temp_data.TOVoid = true - temp_data.TOVoidDesc = "升盘" - temp_data.PreResult = -1 - return -2, temp_data - } - - if math.Abs(a18Bet.SLetBall) > math.Abs(a18Bet.ELetBall) { - temp_data.TOVoidDesc = "降盘" - temp_data.PreResult = -1 - return -2, temp_data - } - return -3, temp_data } + base.Log.Info("比赛时间:", matchDateStr+",对阵:"+v.GuestTeamId, ",初盘让球:", a18Bet.SLetBall, ",即时盘让球:", eLetBall, ",球差:", diffGoal, ",分差:", diffScore, " ,比分:", v.MainTeamGoals, ":", v.GuestTeamGoals, " ,半场比分:", v.MainTeamHalfGoals, ":", v.GuestTeamHalfGoals) if len(temp_data.Id) > 0 { - //更新比赛时间 - temp_data.MatchDate = v.MatchDate - temp_data.PreResult = preResult temp_data.HitCount = temp_data.HitCount + 1 - temp_data.LetBall = a18Bet.ELetBall - temp_data.Desc = fmt.Sprintf("分差:%v ,球差:%v", diffScore, diffGoal) //比赛结果 temp_data.Result = this.IsRight(v, temp_data) return 1, temp_data } else { - temp_data.MatchId = v.Id - temp_data.MatchDate = v.MatchDate - temp_data.SLetBall = a18Bet.SLetBall - temp_data.LetBall = a18Bet.ELetBall - temp_data.Desc = fmt.Sprintf("分差:%v ,球差:%v", diffScore, diffGoal) - temp_data.AlFlag = this.ModelName() - format := time.Now().Format("0102150405") - temp_data.AlSeq = format - temp_data.PreResult = preResult temp_data.HitCount = 3 //比赛结果 temp_data.Result = this.IsRight(v, temp_data)