|
|
@@ -621,7 +621,7 @@ func (apiService *GameTask) GetGameTaskTargetInfoList(api request.GameTargetComp
|
|
|
db := global.GVA_DB.Table("game_target_complete gtc")
|
|
|
db = db.Select("gtc.id,gtc.task_id,gt.task_name,gt.game_id_xmy,gtc.new_target,gt.login_method,gt.user,gtc.pay_target,gtc.retained_target," +
|
|
|
"gtc.new_complete,gtc.pay_complete,gtc.retained_complete,gtc.create_date,gtc.amount,gtc.game_rate,gtc.is_complete,gtc.hand_new_complete," +
|
|
|
- "gtc.hand_retained_complete,gtc.hand_pay_complete,gtc.hand_amount_total")
|
|
|
+ "gtc.hand_retained_complete,gtc.hand_pay_complete,gtc.hand_amount_total, gtc.aupr, gtc.total_amount")
|
|
|
db = db.Joins("left join game_task gt on gt.task_id = gtc.task_id")
|
|
|
//db = db.Where("gtc.create_date = ?", api.CreateDate)
|
|
|
db = db.Where("create_date >= ? and create_date <= ?", startDate, endDate)
|
|
|
@@ -750,7 +750,7 @@ func (s *GameTask) QQCardUsedLogUploadXjf(gameId int, account string, money int)
|
|
|
func (c *GameTask) GetGameTaskTargetById(id int, date string) (api response.GetGameTargetComplete, err error) {
|
|
|
db := global.GVA_DB.Table("game_target_complete gtc")
|
|
|
db = db.Select("gtc.task_id,gt.task_name,gtc.new_target,gt.login_method,gt.user,gtc.pay_target,gtc.retained_target," +
|
|
|
- "gtc.new_complete,gtc.pay_complete,gtc.retained_complete,gtc.create_date,gtc.amount,gtc.game_rate,gtc.is_complete")
|
|
|
+ "gtc.new_complete,gtc.pay_complete,gtc.retained_complete,gtc.create_date,gtc.amount,gtc.game_rate,gtc.is_complete, gtc.aupr, gtc.total_amount")
|
|
|
db = db.Joins("left join game_task gt on gt.task_id = gtc.task_id")
|
|
|
db = db.Where("gtc.task_id = ?", id)
|
|
|
db = db.Where("gtc.create_date = ?", date)
|
|
|
@@ -781,6 +781,8 @@ func (s *GameTask) UpdateGameTaskTarget(requestData request.UpdateGameTaskTarget
|
|
|
"hand_retained_complete": requestData.HandRetainedComplete + gameTask.HandRetainedComplete,
|
|
|
"hand_pay_complete": requestData.HandPayComplete + gameTask.HandPayComplete,
|
|
|
"hand_amount_total": requestData.HandAmountTotal + gameTask.HandAmountTotal,
|
|
|
+ "aupr": requestData.Aupr,
|
|
|
+ "total_amount": requestData.TotalAmount,
|
|
|
}
|
|
|
date := time.Now().Format("2006-01-02")
|
|
|
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
|
|
|
@@ -880,7 +882,7 @@ func (s *GameTask) UpdateGameTaskTarget(requestData request.UpdateGameTaskTarget
|
|
|
msg += "**" + taskData.User + "**"
|
|
|
msg += "\n"
|
|
|
msg += taskData.TaskName + ", 付费目标改为" + strconv.Itoa(requestData.PayTarget)
|
|
|
- url := "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=5ccfb180-c062-48b5-ae18-0c96f7c19f0b"
|
|
|
+ url := "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=5ccfb180-c062-48b5-ae18-0c96f7c19f0b111"
|
|
|
var sendData SendMsg
|
|
|
sendData.MsgType = "markdown"
|
|
|
sendData.Markdown.Content = msg
|