|
|
@@ -212,7 +212,7 @@ func (s *SyncData) SyncTaskData() {
|
|
|
}
|
|
|
}
|
|
|
gameTarget.IsComplete = -1
|
|
|
- if gameTarget.RetainedComplete+completeTaskData[gameTask.TaskId].HandRetainedComplete >= completeTaskData[gameTask.TaskId].RetainedTarget && gameTarget.PayComplete+completeTaskData[gameTask.TaskId].HandPayComplete >= completeTaskData[gameTask.TaskId].PayTarget && gameTarget.NewComplete+completeTaskData[gameTask.TaskId].HandNewComplete >= completeTaskData[gameTask.TaskId].NewTarget {
|
|
|
+ if gameTarget.RetainedComplete >= completeTaskData[gameTask.TaskId].RetainedTarget && gameTarget.PayComplete >= completeTaskData[gameTask.TaskId].PayTarget && gameTarget.NewComplete >= completeTaskData[gameTask.TaskId].NewTarget {
|
|
|
gameTarget.IsComplete = 1
|
|
|
}
|
|
|
global.GVA_DB.Model(&task.GameTargetComplete{}).Where("task_id = ?", gameTask.TaskId).Where("create_date = ?", date).Omit("create_date", "update_time", "task_id").Updates(gameTarget)
|
|
|
@@ -508,6 +508,9 @@ func (s *SyncData) TaskMsgSendRetainedData(ctx context.Context, completesInfo []
|
|
|
sendMsg[name] += fmt.Sprintf("<font color=\"warning\">%s</font>", rate)
|
|
|
}
|
|
|
|
|
|
+ if len(sendMsg) == 0 {
|
|
|
+ return
|
|
|
+ }
|
|
|
for name, msg := range sendMsg {
|
|
|
retained += "\n"
|
|
|
retained += "**" + name + "**"
|
|
|
@@ -661,13 +664,6 @@ func (s *SyncData) TaskMsgSendFreeData(ctx context.Context, completesInfo []task
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-type SendMsg struct {
|
|
|
- MsgType string `json:"msgtype"`
|
|
|
- Markdown struct {
|
|
|
- Content string `json:"content"`
|
|
|
- } `json:"markdown"`
|
|
|
-}
|
|
|
-
|
|
|
func (s *SyncData) SendMsgData(url string, params interface{}) {
|
|
|
_, _ = utils.HttpPost(url, params)
|
|
|
return
|