feat:获取中奖信息调整

handler/activity/jyActivityOther.go

@@ -12,21 +12,22 @@ import (
 	"time"
 )
 
-//当日中奖信息
-func (BP *JyActivity) WinnerInfo() map[string]interface{} {
-	var res map[string]interface{}
-	//加个redis缓存
+// WinnerInfo 当日中奖信息
+func (BP *JyActivity) WinnerInfo(startTime, entTime string) []map[string]interface{} {
+	var res []map[string]interface{}
+	// 加个redis缓存
 	redisCache, err := redis.GetBytes(BidderPlanRedis, WinnerInfoKey)
 	if err == nil {
 		if err = json.Unmarshal(*redisCache, &res); err == nil {
 			return res
 		}
 	}
-	res = award.GetWinnerInfo()
+	res = award.GetWinnerInfo(startTime, entTime)
+	fmt.Println(res)
 	if res != nil {
 		b, err := json.Marshal(res)
 		if err == nil && len(b) > 0 {
-			if err = redis.PutBytes(BidderPlanRedis, WinnerInfoKey, &b, 24*60*60); err != nil {
+			if err = redis.PutBytes(BidderPlanRedis, WinnerInfoKey, &b, 1*60*60); err != nil {
 				log.Println("中将人信息 缓存信息有误")
 			}
 		}

handler/award/user.go

@@ -61,22 +61,30 @@ func SaveQuestionnaire(userId, phone, answers string) bool {
 	return id != ""
 }
 
-// GetWinnerInfo  获取中奖人信息
-func GetWinnerInfo() map[string]interface{} {
-	todayData := db.Mysql.SelectBySql(`SELECT phone,winnerdate,mold FROM winner_info_22_10 WHERE TO_DAYS(winnerdate) = TO_DAYS(NOW())`)
-	if todayData != nil && len(*todayData) > 0 {
-		data := (*todayData)[0]
-		phone := common.ObjToString(data["phone"])
-		if phone != "" && len([]rune(phone)) == 11 {
-			data["phone"] = string(phone[0:3]) + "****" + string(phone[(len(phone)-4):])
-		}
-		switch common.ObjToString(data["mold"]) {
-		case "1":
-			data["mold"] = "获得小米智能音箱"
-		case "2":
-			data["mold"] = "获得iPad1台"
+// GetWinnerInfo 查询活动期间内的中奖名单信息
+func GetWinnerInfo(startTime, endTime string) (rs []map[string]interface{}) {
+	winnerInfo := db.Mysql.SelectBySql(`SELECT phone,winnerdate,mold FROM winner_info_22_10 WHERE winnerdate>=? and winnerdate<?`, startTime, endTime)
+	if winnerInfo != nil && len(*winnerInfo) > 0 {
+		for i := 0; i < len(*winnerInfo); i++ {
+			data := (*winnerInfo)[i]
+			phone := common.ObjToString(data["phone"])
+			winnerDate := common.ObjToString(data["winnerdate"])
+			if phone != "" && len([]rune(phone)) == 11 {
+				data["phone"] = string(phone[0:3]) + "****" + string(phone[(len(phone)-4):])
+			}
+			switch common.ObjToString(data["mold"]) {
+			case "1":
+				data["mold"] = "获得小米智能音箱"
+			case "2":
+				data["mold"] = "获得iPad1台"
+			case "3":
+				data["mold"] = "免单"
+			}
+			if winnerDate != "" {
+				data["winnerdate"] = string(winnerDate[0:10])
+			}
+			rs = append(rs, data)
 		}
-		return data
 	}
-	return nil
+	return rs
 }

services/activity/bidderPlan/services.go

@@ -2,6 +2,7 @@ package bidderPlan
 
 import (
 	. "app.yhyue.com/moapp/jybase/api"
+	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/message/handler/activity"
 	"encoding/json"
@@ -34,8 +35,10 @@ type Activity struct {
 // WinnerInfo 当日中奖信息
 func (act *Activity) WinnerInfo() {
 	userId := gconv.String(act.GetSession("userId"))
-	rData, errMsg := func() (map[string]interface{}, error) {
-		return activity.MembershipDay.WinnerInfo(), nil
+	rData, errMsg := func() ([]map[string]interface{}, error) {
+		startTime := date.FormatDate(&activity.MembershipDay.T2, date.Date_Short_Layout)
+		endTime := date.FormatDate(&activity.MembershipDay.Ed, date.Date_Short_Layout)
+		return activity.MembershipDay.WinnerInfo(startTime, endTime), nil
 	}()
 	if errMsg != nil {
 		log.Printf("Activity WinnerInfo  %s error:%s\n", userId, errMsg.Error())

task/ordermonitor.go

@@ -301,7 +301,6 @@ WHERE order_status = 1 and create_time >=? and create_time<?` + productTypeStr +
 		priceLimitStr + ` AND is_backstage_order = 0
  ORDER BY pay_time  LIMIT ?,1`
 	rs := db.Mysql.SelectBySql(sql, values...)
-	logger.Info(sql, values)
 	if rs != nil && len(*rs) == 1 {
 		return (*rs)[0]
 	}