From db25758762e3e4fba8592936cd4414218f0bb9e8 Mon Sep 17 00:00:00 2001
From: monomania <szy.foggy@gamil.com>
Date: Sat, 28 Dec 2019 02:29:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/wechat/html/today.html                        |  8 +++++++-
 assets/wechat/html/today_detail.html                 |  8 ++++++++
 assets/wechat/html/today_tbs.html                    |  9 ++++++++-
 foot-core/module/suggest/service/SuggestService.go   | 12 ++++--------
 .../module/wechat/service/SuggestTodayService.go     |  2 +-
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/assets/wechat/html/today.html b/assets/wechat/html/today.html
index 963d753..0545bcc 100644
--- a/assets/wechat/html/today.html
+++ b/assets/wechat/html/today.html
@@ -1,4 +1,10 @@
-<span style="color: red;font-weight: bold;font-size: 12px">注意:比赛为程序自动处理,自动更新同步,目前更新周期为30~60分钟一次.</span>
+<h1 style="color: red;font-weight: bold;font-size: 12px"><strong>注意</strong></h1>
+<ul style="color: red;font-weight: bold;font-size: 12px">
+    <li><strong>1.比赛为程序自动处理,自动更新同步,目前更新周期为30~60分钟一次.</strong></li>
+    <li><strong>2.推荐的场次为当前时间"往前推12个小时"至"往后推24小时"的比赛.</strong></li>
+    <li><strong>3.推荐的场次会随指数的变化而不同,如再次进入不见上次推荐的比赛,请查看"待选池比赛".</strong></li>
+    <li style="text-shadow: 0 0 7px blue"><strong>4.(重要)建议多关注支持模型E2的比赛.</strong></li>
+</ul>
 <hr/>
 <ul style="font-size: 12px;font-weight: lighter">
     <li><strong>更新时间:{{.DataDateStr}}</strong></li>
diff --git a/assets/wechat/html/today_detail.html b/assets/wechat/html/today_detail.html
index f1a0656..adb0690 100644
--- a/assets/wechat/html/today_detail.html
+++ b/assets/wechat/html/today_detail.html
@@ -1,3 +1,11 @@
+<h1 style="color: red;font-weight: bold;font-size: 12px"><strong>注意</strong></h1>
+<ul style="color: red;font-weight: bold;font-size: 12px">
+    <li><strong>1.比赛为程序自动处理,自动更新同步,目前更新周期为30~60分钟一次.</strong></li>
+    <li><strong>2.推荐的场次为当前时间"往前推12个小时"至"往后推24小时"的比赛.</strong></li>
+    <li><strong>3.推荐的场次会随指数的变化而不同,如再次进入不见上次推荐的比赛,请查看"待选池比赛".</strong></li>
+    <li style="text-shadow: 0 0 7px blue"><strong>4.(重要)建议多关注支持模型E2的比赛.</strong></li>
+</ul>
+<hr/>
 <ul style="font-size: 12px;font-weight: lighter">
     <li><strong>更新时间:{{.DataDateStr}}</strong></li>
     <li><strong>日期:{{.BeginDateStr}} 至 {{.EndDateStr}}</strong></li>
diff --git a/assets/wechat/html/today_tbs.html b/assets/wechat/html/today_tbs.html
index 1923b5e..63b61ba 100644
--- a/assets/wechat/html/today_tbs.html
+++ b/assets/wechat/html/today_tbs.html
@@ -1,4 +1,11 @@
-<span style="color: red;font-weight: bold;font-size: 12px">注意:以下比赛为待选池中的比赛,未被模型认可.</span>
+<h1 style="color: red;font-weight: bold;font-size: 12px"><strong>注意</strong></h1>
+<ul style="color: red;font-weight: bold;font-size: 12px">
+    <li  style="text-shadow: 0 0 7px blue"><strong>(重要)1.以下比赛为待选池中的比赛,未被模型认可.如被认可成功,则会进入"今日推荐"中.</strong></li>
+    <li><strong>2.比赛为程序自动处理,自动更新同步,目前更新周期为30~60分钟一次.</strong></li>
+    <li><strong>3.待选的场次为当前时间"往前推72小时"至"往后推24小时"的比赛.</strong></li>
+    <li><strong>4.待选的场次会随指数的变化而不同,如再次进入不见上次待选的比赛,请查看"今日推荐".</strong></li>
+    <li style="text-shadow: 0 0 7px blue"><strong>4.(重要)建议多关注支持模型E2的比赛.</strong></li>
+</ul>
 <hr/>
 <ul style="font-size: 12px;font-weight: lighter">
     <li><strong>更新时间:{{.DataDateStr}}</strong></li>
diff --git a/foot-core/module/suggest/service/SuggestService.go b/foot-core/module/suggest/service/SuggestService.go
index 995f6ef..afcb040 100644
--- a/foot-core/module/suggest/service/SuggestService.go
+++ b/foot-core/module/suggest/service/SuggestService.go
@@ -4,8 +4,6 @@ import (
 	"strconv"
 	vo2 "tesou.io/platform/foot-parent/foot-api/module/suggest/vo"
 	"tesou.io/platform/foot-parent/foot-core/common/base/service/mysql"
-	"tesou.io/platform/foot-parent/foot-core/common/utils"
-	"tesou.io/platform/foot-parent/foot-core/module/analy/constants"
 )
 
 /**
@@ -33,9 +31,8 @@ FROM
   foot.t_analy_result ar 
 WHERE mh.LeagueId = l.Id 
   AND mh.Id = ar.MatchId
-  AND ar.HitCount < THitCount 
+  AND (ar.HitCount < THitCount or ar.HitCount = 0) 
 	`
-
 	if len(param.AlFlag) > 0 {
 		sql += " AND ar.AlFlag = '" + param.AlFlag + "' "
 	}
@@ -76,12 +73,11 @@ FROM
   foot.t_analy_result ar 
 WHERE mh.LeagueId = l.Id 
   AND mh.Id = ar.MatchId
+  AND ar.HitCount > 0 
+  AND ar.HitCount >= ar.THitCount
 	`
 	if param.HitCount > 0 {
-		sql += "  AND ar.HitCount >= THitCount AND ar.HitCount >= '" + strconv.Itoa(param.HitCount) + "' "
-	} else {
-		hit_count_str := utils.GetVal(constants.SECTION_NAME, "hit_count")
-		sql += " AND ar.HitCount >= THitCount AND ar.HitCount >= '" + hit_count_str + "' "
+		sql += " AND ar.HitCount >= '" + strconv.Itoa(param.HitCount) + "' "
 	}
 
 	if len(param.AlFlag) > 0 {
diff --git a/foot-core/module/wechat/service/SuggestTodayService.go b/foot-core/module/wechat/service/SuggestTodayService.go
index 96bf114..91450e0 100644
--- a/foot-core/module/wechat/service/SuggestTodayService.go
+++ b/foot-core/module/wechat/service/SuggestTodayService.go
@@ -184,7 +184,7 @@ func (this *SuggestTodayService) ModifyTodayDetail(wcClient *core.Client) {
 func (this *SuggestTodayService) ModifyTodayTbs(wcClient *core.Client) {
 	param := new(vo.SuggestVO)
 	now := time.Now()
-	h12, _ := time.ParseDuration("-12h")
+	h12, _ := time.ParseDuration("-72h")
 	beginDate := now.Add(h12)
 	param.BeginDateStr = beginDate.Format("2006-01-02 15:04:05")
 	h12, _ = time.ParseDuration("24h")
-- 
GitLab