提交 a8696878 编写于 作者: S shi.zeyuan

1.即核实即显示

上级 a9686837
......@@ -134,11 +134,11 @@ func main() {
configService := new(service2.ConfService)
base.Log.Info("--------全量数据更新周期结束--------")
base.Log.Info("--------全量比赛发布公众号开始运行--------")
base.Log.Info("--------全量数据发布公众号开始运行--------")
//3.3 FW001PubApplication 执行发布到雷速
materialController := new(controller.MaterialController)
materialController.ModifyNewsOnly()
base.Log.Info("--------全量临场比赛发布公众号周期结束--------")
base.Log.Info("--------全量数据发布公众号周期结束--------")
time.Sleep(time.Duration(configService.GetSpiderCycleTime()) * time.Minute)
}
......
......@@ -146,11 +146,11 @@ HEAD:
configService := new(service2.ConfService)
base.Log.Info("--------全量数据更新周期结束--------")
base.Log.Info("--------全量比赛发布公众号开始运行--------")
base.Log.Info("--------全量数据发布公众号开始运行--------")
//3.3 FW001PubApplication 执行发布到雷速
materialController := new(controller.MaterialController)
materialController.ModifyNewsOnly()
base.Log.Info("--------全量比赛发布公众号周期结束--------")
base.Log.Info("--------全量数据发布公众号周期结束--------")
time.Sleep(time.Duration(configService.GetSpiderCycleTime()) * time.Minute)
}
......
......@@ -209,7 +209,7 @@ func (this *A1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
format := time.Now().Format("0102150405")
data.AlSeq = format
data.PreResult = preResult
data.HitCount = 1
data.HitCount = 3
data.LetBall = a18Bet.ELetBall
//比赛结果
data.Result = this.IsRight(v, data)
......
......@@ -378,7 +378,7 @@ func (this *C1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
format := time.Now().Format("0102150405")
data.AlSeq = format
data.PreResult = preResult
data.HitCount = 10
data.HitCount = 3
data.LetBall = a18betData.ELetBall
data.MyLetBall = Decimal(letBall)
//比赛结果
......
......@@ -19,6 +19,7 @@ type C2Service struct {
AnalyService
service.BFBattleService
service.BFJinService
service.BFFutureEventService
//最大让球数据
MaxLetBall float64
......@@ -169,8 +170,9 @@ func (this *C2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
}
preResult2 := -1
bfj_main := this.BFJinService.FindNearByTeamName(v.MainTeamId, 1)
bfj_guest := this.BFJinService.FindNearByTeamName(v.GuestTeamId, 1)
if preResult == 3 {
bfj_main := this.BFJinService.FindNearByTeamName(v.MainTeamId, 1)
for _, e := range bfj_main {
if e.HomeTeam == v.MainTeamId && e.HomeScore > e.GuestScore {
preResult2 = 3
......@@ -179,7 +181,6 @@ func (this *C2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
preResult2 = 3
}
}
bfj_guest := this.BFJinService.FindNearByTeamName(v.GuestTeamId, 1)
for _, e := range bfj_guest {
if e.HomeTeam == v.GuestTeamId && e.HomeScore > e.GuestScore {
preResult2 = -1
......@@ -189,7 +190,6 @@ func (this *C2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
}
}
} else {
bfj_guest := this.BFJinService.FindNearByTeamName(v.GuestTeamId, 1)
for _, e := range bfj_guest {
if e.HomeTeam == v.GuestTeamId && e.HomeScore > e.GuestScore {
preResult2 = 0
......@@ -198,7 +198,6 @@ func (this *C2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
preResult2 = 0
}
}
bfj_main := this.BFJinService.FindNearByTeamName(v.MainTeamId, 1)
for _, e := range bfj_main {
if e.HomeTeam == v.MainTeamId && e.HomeScore > e.GuestScore {
preResult2 = -1
......@@ -213,6 +212,17 @@ func (this *C2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
return -3, nil
}
bffe_main := this.BFFutureEventService.FindNextBattle(matchId, v.MainTeamId)
bffe_guest := this.BFFutureEventService.FindNextBattle(matchId, v.GuestTeamId)
if strings.ContainsAny(bffe_main.EventLeagueId, "杯") {
//下一场打杯赛
return -3, nil
}
if strings.ContainsAny(bffe_guest.EventLeagueId, "杯") {
//下一场打杯赛
return -3, nil
}
var data *entity5.AnalyResult
temp_data := this.Find(v.Id, this.ModelName())
if len(temp_data.Id) > 0 {
......@@ -232,7 +242,7 @@ func (this *C2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
format := time.Now().Format("0102150405")
data.AlSeq = format
data.PreResult = preResult
data.HitCount = 10
data.HitCount = 3
data.LetBall = a18betData.ELetBall
//比赛结果
data.Result = this.IsRight(v, data)
......
......@@ -211,7 +211,7 @@ func (this *E1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
format := time.Now().Format("0102150405")
data.AlSeq = format
data.PreResult = preResult
data.HitCount = 1
data.HitCount = 3
data.LetBall = a18bet.ELetBall
//比赛结果
data.Result = this.IsRight(v, data)
......
......@@ -164,7 +164,7 @@ func (this *E2Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
format := time.Now().Format("0102150405")
data.AlSeq = format
data.PreResult = preResult
data.HitCount = 1
data.HitCount = 3
data.LetBall = a18betData.ELetBall
//比赛结果
data.Result = this.IsRight2Option(v, data)
......
......@@ -155,7 +155,7 @@ func (this *Q1Service) analyStub(v *pojo.MatchLast) (int, *entity5.AnalyResult)
format := time.Now().Format("0102150405")
data.AlSeq = format
data.PreResult = preResult
data.HitCount = 1
data.HitCount = 3
data.LetBall = a18betData.ELetBall
//比赛结果
data.Result = this.IsRight(v, data)
......
......@@ -261,7 +261,16 @@ func (this *BaseFaceProcesser) jin_process(matchId string, p *page.Page) []*pojo
data_list_slice = append(data_list_slice, v)
}
for _, v := range data.GuestInfo {
data_list_slice = append(data_list_slice, v)
var exist bool
for _, v2 := range data_list_slice {
if v.ScheduleID == v2.ScheduleID {
exist = true
break
}
}
if !exist {
data_list_slice = append(data_list_slice, v)
}
}
return data_list_slice
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册