Преглед изворни кода

添加aupr和总付费金额

maker пре 3 година
родитељ
комит
babf569bf2
3 измењених фајлова са 13 додато и 3 уклоњено
  1. 6 0
      model/task/request/game_task.go
  2. 2 0
      model/task/response/game_task.go
  3. 5 3
      service/task/game_task.go

+ 6 - 0
model/task/request/game_task.go

@@ -77,6 +77,8 @@ type GameTargetCompleteRequest struct {
 	IsComplete       int      `json:"is_complete"`
 	Date             []string `json:"date"`
 	GamePortId       int      `json:"game_port_id"`
+	Aupr             int      `json:"aupr"`
+	TotalAmount      float64      `json:"total_amount"`
 }
 
 type GetGameTaskTargetByIdRequest struct {
@@ -99,6 +101,10 @@ type UpdateGameTaskTargetRequest struct {
 	FreeMethod           int        `json:"free_method"`
 	IsUploadWt           int        `json:"is_upload_wt"`
 	IsUploadXjf          int        `json:"is_upload_xjf"`
+
+	//添加字段
+	Aupr        int `json:"aupr"`
+	TotalAmount float64 `json:"total_amount"`
 }
 
 type CardInfo struct {

+ 2 - 0
model/task/response/game_task.go

@@ -68,6 +68,8 @@ type GetGameTargetComplete struct {
 	HandPayComplete      int    `json:"hand_pay_complete"`
 	HandAmountTotal      int    `json:"hand_amount_total"`
 	GameIdXmy            string `json:"game_id_xmy"`
+	Aupr                 int    `json:"aupr"`
+	TotalAmount          float64    `json:"total_amount"`
 }
 
 type GameTargetStatistics struct {

+ 5 - 3
service/task/game_task.go

@@ -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