From cfcbe8115370359a1a06f57173e3e2888c801732 Mon Sep 17 00:00:00 2001
From: tommy <3405129587@qq.com>
Date: Fri, 10 Jul 2020 18:05:50 +0800
Subject: [PATCH] fix:bug

---
 controllers/client/tug_war.go | 9 ++++-----
 controllers/pc/tug_war.go     | 2 +-
 models/bahe_team_member.go    | 9 ++++++---
 models/base.go                | 1 +
 models/customer_order.go      | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/controllers/client/tug_war.go b/controllers/client/tug_war.go
index f7e21e9..7e8f314 100644
--- a/controllers/client/tug_war.go
+++ b/controllers/client/tug_war.go
@@ -66,18 +66,18 @@ func (t *TugOfWarCtl) Shake() {
 	baheId := t.MustGetInt64("bahe_activity_id")
 	score := t.MustGetInt64("score") // 增加的分数
 
-	bahe := new(models.TugOfWar)
+	bahe := &models.TugOfWar{}
 	exist, err := models.Get(bahe, baheId)
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_MODULE_NOT_EXIST, "拔河活动不存在")
 
-	activity := new(models.Activity)
+	activity := &models.Activity{}
 	exist, err = models.Get(activity, bahe.ActivityId)
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_ACTIVITY_NOT_EXIST, "互动不存在")
 	t.CheckRunning(activity.Status)
 
-	member := new(models.BaheTeamMember)
+	member := &models.BaheTeamMember{}
 	exist, err = member.GetMemberByBaheIdAndUserId(activity.ArchId, uid, baheId, activity.RehearsalId)
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_ERR, "该用户尚未加入队伍")
@@ -89,8 +89,7 @@ func (t *TugOfWarCtl) Shake() {
 	}
 
 	// 根据team_id 获取所有成员的分数
-	members := make([]*models.BaheTeamMember, 0)
-	err = models.GetBaheMembersByTeamId(members, member.TeamId, member.RehearsalId)
+	members, err := models.GetBaheMembersByTeamId(member.TeamId, member.RehearsalId)
 	t.CheckErr(err)
 
 	var rank int
diff --git a/controllers/pc/tug_war.go b/controllers/pc/tug_war.go
index 52aa06c..aafac14 100644
--- a/controllers/pc/tug_war.go
+++ b/controllers/pc/tug_war.go
@@ -221,7 +221,7 @@ func (t *TugOfWarCtl) Score() {
 	err = core.GetXormAuto().Table(new(models.BaheTeam)).Alias("t").
 		Select("sum(m.score) as total_score, t.id, t.activity_id, t.bahe_activity_id, t.bahe_team_name").
 		Join("LEFT", new(models.BaheTeamMember).Alias("m"),
-			"t.id=m.team_id and m.is_delete=0 and m.rehearsal_id=? and arch_id=?",
+			"t.id=m.team_id and m.is_delete=0 and m.rehearsal_id=? and m.arch_id=?",
 			activity.RehearsalId, activity.ArchId).Where("t.is_delete=0 and t.bahe_activity_id=?", baheId).
 		GroupBy("t.id").Find(&teams)
 	t.CheckErr(err)
diff --git a/models/bahe_team_member.go b/models/bahe_team_member.go
index 14a9e5d..19f93d0 100644
--- a/models/bahe_team_member.go
+++ b/models/bahe_team_member.go
@@ -45,7 +45,10 @@ func (t *BaheTeamMember) IncrScoreById(archId, id, score interface{}) (int64, er
 		Incr("score", score).Cols("score, sort_time").Update(t)
 }
 
-func GetBaheMembersByTeamId(obj, teamId, rehearsalId interface{}) error {
-	return core.GetXormAuto().Where("is_delete=0 and team_id=? and rehearsal_id=?",
-		teamId, rehearsalId).Desc("score").Asc("sort_time").Find(&obj)
+func GetBaheMembersByTeamId(teamId, rehearsalId interface{}) ([]*BaheTeamMember, error) {
+	members := make([]*BaheTeamMember, 0)
+	err := core.GetXormAuto().Where("is_delete=0 and team_id=? and rehearsal_id=?",
+		teamId, rehearsalId).Desc("score").Asc("sort_time").Find(&members)
+	return members, err
+
 }
diff --git a/models/base.go b/models/base.go
index eca50eb..d1d0e27 100644
--- a/models/base.go
+++ b/models/base.go
@@ -17,6 +17,7 @@ func init() {
 		new(AreaStore),
 		new(AuctionHistory),
 		new(AuctionResultRecord),
+		new(AuctionPlayer),
 		new(BaheTeam),
 		new(BaheTeamMember),
 		new(BarrageHistory),
diff --git a/models/customer_order.go b/models/customer_order.go
index 6165fca..79d5b5a 100644
--- a/models/customer_order.go
+++ b/models/customer_order.go
@@ -85,7 +85,7 @@ func (t *CustomerOrder) UpdateStatusBy(outTradeNo string, originStatus, status i
 
 func GetExpiredAtLiveCustomerOrder() ([]*CustomerOrder, error) {
 	orders := make([]*CustomerOrder, 0)
-	err := core.GetXormAuto().Where("type=1 and is_delete=0 and status=0 and expire_time <= ?", time.Now().Unix()).Find(&orders)
+	err := core.GetXormAuto().Where("type=1 and is_delete=0 and status=0 and expire_time <= ? and out_trade_no<>''", time.Now().Unix()).Find(&orders)
 	if err != nil {
 		return nil, err
 	}