|
@@ -1,6 +1,7 @@
|
|
|
package activity
|
|
|
|
|
|
import (
|
|
|
+ "app.yhyue.com/moapp/jybase/common"
|
|
|
"app.yhyue.com/moapp/jybase/date"
|
|
|
"app.yhyue.com/moapp/jybase/go-logger/logger"
|
|
|
"app.yhyue.com/moapp/message/db"
|
|
@@ -104,16 +105,18 @@ func LotteryDrawTask(msg *model.Message) {
|
|
|
}
|
|
|
//当前周期内 是否已完成任务
|
|
|
if taskInfo.CycleNum > 0 {
|
|
|
- count := db.Mysql.CountBySql(fmt.Sprintf(`SELECT COUNT(ltu.id) FROM %s ltu WHERE ltu.active_id = ? AND ltu.task_id = ? AND ltu.create_date < ? AND ltu.create_date > ? `, tableTaskUser), taskInfo.ActiveId, taskInfo.Id, timeRange.EndTime.Format(date.Date_Full_Layout), timeRange.StartTime.Format(date.Date_Full_Layout))
|
|
|
- if taskInfo.CycleNum <= int(count) {
|
|
|
- logger.Info(fmt.Sprintf("用户:%s ,此任务:%s ,在 %s 已完成", msgBody.Phone, taskInfo.Name, timeRange.StartTime.Format(date.Date_Short_Layout)))
|
|
|
+ tasks := db.Mysql.SelectBySql(fmt.Sprintf(`SELECT ltu.create_date FROM %s ltu WHERE ltu.active_id = ? AND ltu.task_id = ? AND ltu.create_date < ? AND ltu.create_date > ? `, tableTaskUser), taskInfo.ActiveId, taskInfo.Id, timeRange.EndTime.Format(date.Date_Full_Layout), timeRange.StartTime.Format(date.Date_Full_Layout))
|
|
|
+ if tasks != nil && taskInfo.CycleNum <= len(*tasks) {
|
|
|
+ createDate := common.InterfaceToStr((*tasks)[0]["create_date"])
|
|
|
+ logger.Info(fmt.Sprintf("用户:%s ,此任务:%s ,在 %s 已完成", msgBody.Phone, taskInfo.Name, createDate))
|
|
|
return
|
|
|
}
|
|
|
} else if msgBody.OrderCode != "" {
|
|
|
- count := db.Mysql.CountBySql(fmt.Sprintf(`SELECT COUNT(ltu.id) FROM %s ltu WHERE ltu.active_id = ? AND ltu.position_id = ? AND ltu.order_code = ?`, tableTaskUser), taskInfo.ActiveId, msgBody.PositionId, msgBody.OrderCode)
|
|
|
+ tasks := db.Mysql.SelectBySql(fmt.Sprintf(`SELECT ltu.create_date FROM %s ltu WHERE ltu.active_id = ? AND ltu.position_id = ? AND ltu.order_code = ?`, tableTaskUser), taskInfo.ActiveId, msgBody.PositionId, msgBody.OrderCode)
|
|
|
//TODO 判重 担心订单有更新
|
|
|
- if count > 0 {
|
|
|
- logger.Info(fmt.Sprintf("用户:%s ,此订单:%s ,在 %s 已新增抽奖机会", msgBody.Phone, msgBody.OrderCode, timeRange.StartTime.Format(date.Date_Short_Layout)))
|
|
|
+ if tasks != nil && len(*tasks) > 0 {
|
|
|
+ createDate := common.InterfaceToStr((*tasks)[0]["create_date"])
|
|
|
+ logger.Info(fmt.Sprintf("用户:%s ,此订单:%s ,在 %s 已新增抽奖机会", msgBody.Phone, msgBody.OrderCode, createDate))
|
|
|
return
|
|
|
}
|
|
|
}
|