Merge branch 'master' into feature/v1.1.14

jyBXCore/rpc/model/es/search.go

@@ -9,6 +9,7 @@ import (
 	IC "jyBXCore/rpc/init"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // GetSearchQuery  整理关键词等查询条件
@@ -254,6 +255,12 @@ func GetBidSearchQuery(in *bxcore.SearchReq) string {
 			query += `,`
 		}
 		if endTime != "" {
+			//电脑端 时间选择 开始时间当天和结束时间当天相同
+			if startTime == endTime {
+				et, _ := strconv.ParseInt(endTime, 0, 64)
+				etTime := time.Unix(et, 0)
+				endTime = fmt.Sprint(time.Date(etTime.Year(), etTime.Month(), etTime.Day()+1, 0, 0, 0, 0, time.Local).Unix())
+			}
 			query += `"lt":` + endTime
 		}
 		query += `}}}`

jyBXSubscribe/rpc/model/push.go

@@ -166,11 +166,14 @@ func (s *subscribePush) PutTodayCache(userId, userType string, pc_a *SubPush) {
 // 获取redis key
 func (s *subscribePush) todayKey(userId, userType string) string {
 	if userType == EntnicheFlag {
-		return fmt.Sprintf("%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, userId)
-	} else {
-		return fmt.Sprintf("%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, userId)
+		switch userType {
+		case SubVipFlag:
+			return fmt.Sprintf("%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "vip", userId)
+		case MemberFlag:
+			return fmt.Sprintf("%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "member", userId)
+		}
 	}
-
+	return fmt.Sprintf("%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, userId)
 }
 func (s *subscribePush) allKey(userId, userType string) string {
 	if s.ModuleFlag == EntnicheFlag {
@@ -179,8 +182,6 @@ func (s *subscribePush) allKey(userId, userType string) string {
 			return fmt.Sprintf("all_%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "vip", userId)
 		case MemberFlag:
 			return fmt.Sprintf("all_%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "member", userId)
-		case SubFreeFlag:
-			return fmt.Sprintf("all_%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "free", userId)
 		}
 	}
 	return fmt.Sprintf("all_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, userId)