Эх сурвалжийг харах

Merge branch 'dev/v1.2.6_zxl' of moapp/message into feature/v1.2.6

zhangxinlei1996 1 жил өмнө
parent
commit
a35f57022f

+ 3 - 1
handler/activity/task.go

@@ -147,7 +147,8 @@ func Task(msg *model.Message) {
 			status := taskTypeArr[1]
 			status := taskTypeArr[1]
 			if status == "0" {
 			if status == "0" {
 				db.Tidb.Update("integral_task_detail", query, map[string]interface{}{
 				db.Tidb.Update("integral_task_detail", query, map[string]interface{}{
-					"status": 1,
+					"status":      1,
+					"finish_time": time.Now().Format(date.Date_Full_Layout),
 				})
 				})
 				taskMsgMap[types] = fmt.Sprintf("%s_%v", taskId, 1)
 				taskMsgMap[types] = fmt.Sprintf("%s_%v", taskId, 1)
 			}
 			}
@@ -165,6 +166,7 @@ func Task(msg *model.Message) {
 				}
 				}
 			}
 			}
 			endtime, _ := time.Parse(date.Date_Full_Layout, end_time)
 			endtime, _ := time.Parse(date.Date_Full_Layout, end_time)
+			fmt.Println(finishStatus, success_status == 0, time.Now().Before(endtime))
 			if finishStatus && success_status == 0 && time.Now().Before(endtime) {
 			if finishStatus && success_status == 0 && time.Now().Before(endtime) {
 				//判断是否完成所有任务且开启确认挑战
 				//判断是否完成所有任务且开启确认挑战
 				if mrpc.SubVipHarvest(msg.E_userId, 7, "") == nil {
 				if mrpc.SubVipHarvest(msg.E_userId, 7, "") == nil {