1.xxx

FOOT000Test.go

@@ -24,7 +24,7 @@ func Decimal(value float64) float64 {
 
 
 func main(){
-	new(service.SuggestTodayService).ModifyTodayDetailNew()
+	new(service.SuggestTodayService).ModifyTodayDetailNew(nil)
 }
 
 //func main() {

assets/common/template/analycontent/001.html

 {{.MainTeam}}
 积{{.BFSMainZong.Score}}分,
-现居排行榜{{.BFSMainZong.Ranking}}名,
+居排行榜{{.BFSMainZong.Ranking}}名.
 
 {{.GuestTeam}}
 积{{.BFSGuestZong.Score}}分,
-现居排行榜{{.BFSGuestZong.Ranking}}名,
+居排行榜{{.BFSGuestZong.Ranking}}名.

assets/common/template/analycontent/002.html

 近期两队对战{{.BattleCount}}场,
-主队取得{{.BattleMainWinCount}}胜,
-客队取得{{.BattleGuestWinCount}}胜.
-平{{.BattleDrawCount}}场.
-
-
+主队{{.BattleMainWinCount}}胜,{{.BattleDrawCount}}平.{{.BattleGuestWinCount}}负.

assets/common/template/analycontent/003.html

-{{if eq .MainTeam .MainNextMainTeam }}
-下场赛事,主队继续坐阵主场,具备有一定的心理优势.
-{{else}}
-下场赛事,主队转圜客场,本场不容有失.
-{{end}}
-
-{{if eq .GuestTeam .GuestNextMainTeam }}
-下场赛事,客队转回主场作战.
-{{else}}
-下场赛事,客队继续转圜其他客场,不免受行程疲惫影响.
-{{end}}
+{{.MainTeam}}近{{.BFSMainJin.MatchCount}}场,取得{{.BFSMainJin.WinCount}}胜,{{.BFSMainJin.DrawCount}}平,{{.BFSMainJin.FailCount}}负.
+{{.GuestTeam}}近{{.BFSGuestJin.MatchCount}}场,取得{{.BFSGuestJin.WinCount}}胜,{{.BFSGuestJin.DrawCount}}平,{{.BFSGuestJin.FailCount}}负.
\ No newline at end of file

assets/common/template/analycontent/004.html

-个人心得,结合基本面,亚欧盘.
-推算出自认为本次比赛合理的让球应为:{{.MyLetBall}}.
+{{if eq .MainTeam .MainNextMainTeam }}
+下场赛事,主队继续坐阵主场,具备有一定的心理优势.
\ No newline at end of file
+{{else}}
+下场赛事,主队转圜客场,本场不容有失.
+{{end}}
+
+{{if eq .GuestTeam .GuestNextMainTeam }}
+下场赛事,客队转回主场作战.
+{{else}}
+下场赛事,客队继续转圜其他客场,不免受行程疲惫影响.
+{{end}}
\ No newline at end of file

assets/common/template/analycontent/005.html

+个人心得,结合基本面,亚欧盘.
+{{if eq .AlFlag "C1"}}
+推算出自认为本次比赛合理的让球应为:{{.MyLetBall}}.
+{{end}}
\ No newline at end of file

assets/common/template/analycontent/102.html

 {{ template "001.html" . }}
-{{ template "003.html" . }}
+{{ template "004.html" . }}
 
 {{ template "footer.html" . }}
 

assets/common/template/analycontent/103.html

 {{ template "001.html" . }}
-{{ template "004.html" . }}
+{{ template "005.html" . }}
 
 {{ template "footer.html" . }}
 

assets/common/template/analycontent/104.html

 {{ template "002.html" . }}
-{{ template "003.html" . }}
+{{ template "004.html" . }}
 
 {{ template "footer.html" . }}
 

assets/common/template/analycontent/105.html

 {{ template "002.html" . }}
-{{ template "004.html" . }}
+{{ template "005.html" . }}
 
 {{ template "footer.html" . }}
 

assets/common/template/analycontent/106.html

-{{ template "003.html" . }}
 {{ template "004.html" . }}
+{{ template "005.html" . }}
 
 {{ template "footer.html" . }}
 

assets/common/template/analycontent/wechat_today_detail_new.html

 {{ template "001.html" . }}
 {{ template "002.html" . }}
-{{ template "003.html" . }}
-{{ template "004.html" . }}
+{{ template "005.html" . }}
 
 {{ template "footer.html" . }}
 

foot-core/module/suggest/service/SuggestService.go

@@ -195,30 +195,33 @@ WHERE mh.LeagueId = l.Id
 		}
 		//过往战绩
 		bfbList := this.BFBattleService.FindByMatchId(matchId)
+		battleCount := 0
 		mainWin := 0
-		draw := 0
+		drawCount := 0
 		guestWin := 0
 		for _, e := range bfbList {
-			if e.BattleMainTeamGoals == e.BattleGuestTeamGoals {
-				draw++
-			} else {
-				if e.BattleMainTeamId == v.MainTeam && e.BattleMainTeamGoals > e.BattleGuestTeamGoals {
-					mainWin++
-				}
-				if e.BattleGuestTeamId == v.MainTeam && e.BattleGuestTeamGoals > e.BattleMainTeamGoals {
-					mainWin++
-				}
-				if e.BattleMainTeamId == v.GuestTeam && e.BattleMainTeamGoals > e.BattleGuestTeamGoals {
-					guestWin++
-				}
-				if e.BattleGuestTeamId == v.GuestTeam && e.BattleGuestTeamGoals > e.BattleMainTeamGoals {
-					guestWin++
-				}
+			if e.BattleMainTeamId == v.MainTeam || e.BattleMainTeamId == v.GuestTeam {
+				battleCount++
+			}
+			if e.BattleMainTeamId == v.MainTeam && e.BattleMainTeamGoals > e.BattleGuestTeamGoals {
+				mainWin++
+			}
+			if e.BattleGuestTeamId == v.MainTeam && e.BattleGuestTeamGoals > e.BattleMainTeamGoals {
+				mainWin++
+			}
+			if e.BattleMainTeamId == v.GuestTeam && e.BattleMainTeamGoals > e.BattleGuestTeamGoals {
+				guestWin++
+			}
+			if e.BattleGuestTeamId == v.GuestTeam && e.BattleGuestTeamGoals > e.BattleMainTeamGoals {
+				guestWin++
+			}
+			if (e.BattleMainTeamId == v.MainTeam || e.BattleMainTeamId == v.GuestTeam) && e.BattleMainTeamGoals == e.BattleGuestTeamGoals {
+				drawCount++
 			}
 		}
-		v.BattleCount = len(bfbList)
+		v.BattleCount = battleCount
 		v.BattleMainWinCount = mainWin
-		v.BattleDrawCount = draw
+		v.BattleDrawCount = drawCount
 		v.BattleGuestWinCount = guestWin
 		//未来赛事
 		bffe_main := this.BFFutureEventService.FindNextBattle(matchId, v.MainTeam)

foot-core/module/wechat/service/SuggestTodayService.go

@@ -262,8 +262,8 @@ func (this *SuggestTodayService) ModifyTodayDetailNew(wcClient *core.Client) {
 		"assets/wechat/html/today_detail_new.html",
 		"assets/common/template/analycontent/001.html",
 		"assets/common/template/analycontent/002.html",
-		"assets/common/template/analycontent/003.html",
 		"assets/common/template/analycontent/004.html",
+		"assets/common/template/analycontent/005.html",
 		"assets/common/template/analycontent/footer.html",
 		"assets/common/template/analycontent/wechat_today_detail_new.html",
 	}