1.不删除分析出的比赛

assets/wechat/html/month.html

@@ -40,10 +40,7 @@
         style="background-color: orange"
         {{end}}
         >
-            <strong>
-            {{preResultStr .PreResult}}
-            </strong>
-            {{alFlagStr .AlFlag}}
+            {{preResultStr .PreResult}}({{alFlagStr .AlFlag}})
         </td>
 
     </tr>

assets/wechat/html/today.html

@@ -45,10 +45,7 @@
             style="background-color: orange"
             {{end}}
             >
-                <strong>
-                {{preResultStr .PreResult}}
-                </strong>
-                {{alFlagStr .AlFlag}}
+                {{preResultStr .PreResult}}({{alFlagStr .AlFlag}})
             </td>
 
         </tr>

assets/wechat/html/today_detail.html

@@ -11,7 +11,8 @@
         <li>联　　赛:{{.LeagueName}}</li>
         <li>对阵双方:{{.MainTeam}}({{.LetBall}}){{.GuestTeam}}</li>
         <li>球探指数:{{.HitCount}}</li>
-        <li>分　　析:<span style="color: red;font-weight: bold;font-size: 12px">tips:内容开发中....</span></li>
+		<li>推荐选项:<span style="color: red;font-weight: bold;">{{preResultStr .PreResult}}</span></li>
+        <li>分　　析:<span style="color: red;font-weight: bold;font-size: 12px">内容开发中....</span></li>
     </ul>
     <hr/>
     {{end}}

assets/wechat/html/today_tbs.html

@@ -36,10 +36,7 @@
             {{.MainTeamGoal}}:{{.GuestTeamGoal}}
             </td>
             <td>
-                <strong>
-                {{preResultStr .PreResult}}
-                </strong>
-                {{alFlagStr .AlFlag}}
+                {{preResultStr .PreResult}}({{alFlagStr .AlFlag}})
             </td>
             <td style="color: red">
                 <strong>{{.HitCount}}</strong>

assets/wechat/html/week.html

@@ -40,10 +40,7 @@
         style="background-color: orange"
         {{end}}
         >
-            <strong>
-            {{preResultStr .PreResult}}
-            </strong>
-            {{alFlagStr .AlFlag}}
+            {{preResultStr .PreResult}}({{alFlagStr .AlFlag}})
         </td>
 
     </tr>

assets/wechat/使用说明.md

@@ -44,6 +44,10 @@
   >> 主队盘口打出
 * 客  
   >> 客队盘口打出
+* 上盘 
+  >> 让球方盘口打出
+* 下盘  
+  >> 受让球方盘口打出
 
 ## 模型说明
 * A1模型  

foot-core/module/analy/service/AnalyService.go

@@ -156,6 +156,8 @@ WHERE ml.LeagueId = l.Id
 	}
 	if hitCount > 0 {
 		sql_build += " AND ar.HitCount >= " + strconv.Itoa(hitCount)
+	}else{
+		sql_build += " AND ar.HitCount > 0 "
 	}
 	if option >= 0 {
 		sql_build += " AND ar.PreResult = " + strconv.Itoa(option) + " "

foot-core/module/analy/service/Asia20191206Service.go

@@ -53,10 +53,10 @@ func (this *Asia20191206Service) Analy() {
 				hit_count, _ := strconv.Atoi(hit_count_str)
 				if temp_data.HitCount >= hit_count {
 					temp_data.HitCount = (hit_count / 2) - 1
-					this.AnalyService.Modify(temp_data)
-					continue
+				}else{
+					temp_data.HitCount = 0
 				}
-				this.AnalyService.Del(temp_data)
+				this.AnalyService.Modify(temp_data)
 			}
 		}
 	}

foot-core/module/analy/service/Euro20191206Service.go

@@ -48,10 +48,10 @@ func (this *Euro20191206Service) Analy() {
 				hit_count, _ := strconv.Atoi(hit_count_str)
 				if temp_data.HitCount >= hit_count {
 					temp_data.HitCount = (hit_count / 2) - 1
-					this.AnalyService.Modify(temp_data)
-					continue
+				}else{
+					temp_data.HitCount = 0
 				}
-				this.AnalyService.Del(temp_data)
+				this.AnalyService.Modify(temp_data)
 			}
 		}
 	}

foot-core/module/analy/service/Euro20191212Service.go

@@ -48,10 +48,10 @@ func (this *Euro20191212Service) Analy() {
 				hit_count, _ := strconv.Atoi(hit_count_str)
 				if temp_data.HitCount >= hit_count {
 					temp_data.HitCount = (hit_count / 2) - 1
-					this.AnalyService.Modify(temp_data)
-					continue
+				}else{
+					temp_data.HitCount = 0
 				}
-				this.AnalyService.Del(temp_data)
+				this.AnalyService.Modify(temp_data)
 			}
 		}
 	}

foot-core/module/analy/service/Euro20191226Service.go

@@ -48,10 +48,10 @@ func (this *Euro20191226Service) Analy() {
 				hit_count, _ := strconv.Atoi(hit_count_str)
 				if temp_data.HitCount >= hit_count {
 					temp_data.HitCount = (hit_count / 2) - 1
-					this.AnalyService.Modify(temp_data)
-					continue
+				}else{
+					temp_data.HitCount = 0
 				}
-				this.AnalyService.Del(temp_data)
+				this.AnalyService.Modify(temp_data)
 			}
 		}
 	}

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

@@ -75,7 +75,7 @@ FROM
   foot.t_match_his mh,
   foot.t_analy_result ar 
 WHERE mh.LeagueId = l.Id 
-  AND mh.Id = ar.MatchId 
+  AND mh.Id = ar.MatchId
 	`
 	if param.HitCount > 0 {
 		sql += "  AND ar.HitCount >= THitCount AND ar.HitCount >= '" + strconv.Itoa(param.HitCount) + "' "

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

@@ -24,11 +24,11 @@ type SuggestTodayService struct {
 
 func preResultStr(val int) string {
 	if 3 == val {
-		return "主"
+		return "主不败"
 	} else if 1 == val {
 		return "平"
 	} else if 0 == val {
-		return "客"
+		return "客不败"
 	}
 	return "-"
 }