关键词标准调整

handler/activity/lotteryDrawTask.go

@@ -135,15 +135,12 @@ func LotteryDrawTask(msg *model.Message) {
 	case 2: //设置关键词任务
 		var hasKeys bool
 		//查看当前用户是否有订阅词
-		res := db.Compatible.Select(msgBody.UserId, `{"o_vipjy":1,"o_member_jy":1,"o_jy":"1"}`)
+		res := db.Compatible.Select(msgBody.UserId, `{"o_vipjy":1,"i_vip_status":1,"o_member_jy":1,"i_member_status":1,"o_jy":"1"}`)
 		if res != nil && len(*res) > 0 {
-			obj, _ := (*res)["o_jy"].(map[string]interface{})
-			aKey, _ := obj["a_key"].([]interface{})
-			if len(aKey) > 0 {
-				hasKeys = true
-			}
-			if !hasKeys {
-				obj, _ = (*res)["o_vipjy"].(map[string]interface{})
+			vipStatus := common.IntAll((*res)["i_vip_status"])
+			memberStatus := common.IntAll((*res)["i_member_status"])
+			if vipStatus > 0 || memberStatus > 0 {
+				obj, _ := (*res)["o_vipjy"].(map[string]interface{})
 				if obj != nil {
 					itmes, _ := obj["a_items"].([]interface{})
 					for _, v := range itmes {
@@ -155,20 +152,26 @@ func LotteryDrawTask(msg *model.Message) {
 						}
 					}
 				}
-			}
-			if !hasKeys {
-				obj, _ = (*res)["o_member_jy"].(map[string]interface{})
-			}
-			if obj != nil {
-				itmes, _ := obj["a_items"].([]interface{})
-				for _, v := range itmes {
-					item, _ := v.(map[string]interface{})
-					keys, _ := item["a_key"].([]interface{})
-					if len(keys) > 0 {
-						hasKeys = true
-						break
+				if !hasKeys {
+					obj, _ = (*res)["o_member_jy"].(map[string]interface{})
+				}
+				if obj != nil {
+					itmes, _ := obj["a_items"].([]interface{})
+					for _, v := range itmes {
+						item, _ := v.(map[string]interface{})
+						keys, _ := item["a_key"].([]interface{})
+						if len(keys) > 0 {
+							hasKeys = true
+							break
+						}
 					}
 				}
+			} else {
+				obj, _ := (*res)["o_jy"].(map[string]interface{})
+				aKey, _ := obj["a_key"].([]interface{})
+				if len(aKey) > 0 {
+					hasKeys = true
+				}
 			}
 		}
 		//没有设置关键词