Merge remote-tracking branch 'origin/feature/v1.1.45' into dev_v1.1.45_wh

jyBXSubscribe/rpc/model/push.go

@@ -114,6 +114,7 @@ type SubPushQueryParam struct {
 	Item             string
 	SelectKeys       []string //关键词
 	District         string
+	SubPushInactive  string // 订阅活跃标记
 }
 
 // 关键词参数
@@ -1072,14 +1073,10 @@ func (s *subscribePush) DefaultDatas(spqp *SubPushQueryParam, bsp *ViewCondition
 	if spqp.UserId == "" {
 		return false, 0, nil
 	}
-	t1 := time.Now()
 	logx.Info("userId:", spqp.UserId, "newUserId:", spqp.NewUserId)
-	//用户信息
-	//bsp := s.GetUserInfo(spqp)
-	logx.Info("获取用户信息耗时：", time.Since(t1))
-	t2 := time.Now()
+	t1 := time.Now()
 	if len(bsp.Keyword) > 0 {
-		logx.Info(time.Since(t1), "--bsp:", bsp)
+		logx.Info("--bsp:", bsp)
 		//获取查询语句
 		qstr := s.getDefaultDatasSQL(bsp)
 		list := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSort, bidField, 0, bsp.Size, 0, false)
@@ -1093,7 +1090,7 @@ func (s *subscribePush) DefaultDatas(spqp *SubPushQueryParam, bsp *ViewCondition
 			}
 		}
 	}
-	logx.Info("请求耗时：", time.Since(t2))
+	logx.Info("请求耗时：", time.Since(t1))
 	return
 }
 
@@ -1365,7 +1362,8 @@ func (s *subscribePush) GetUserInfo(spqp *SubPushQueryParam) (vc *ViewCondition)
 	}{}
 	switch s.ModuleFlag {
 	case MemberFlag:
-		userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_member_jy":1,"i_member_status":1}`)
+		userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_member_jy":1,"i_member_status":1,"subpush_inactive":1}`)
+		spqp.SubPushInactive = common.ObjToString((*userMap)["subpush_inactive"])
 		if !ok || userMap == nil || len(*userMap) == 0 {
 			return &ViewCondition{}
 		}
@@ -1380,7 +1378,8 @@ func (s *subscribePush) GetUserInfo(spqp *SubPushQueryParam) (vc *ViewCondition)
 			tmpInfo.District, _ = o_member_jy["o_district"].(map[string]interface{})
 		}
 	case SubVipFlag:
-		userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_vipjy":1,"i_vip_status":1}`)
+		userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_vipjy":1,"i_vip_status":1,"subpush_inactive":1}`)
+		spqp.SubPushInactive = common.ObjToString((*userMap)["subpush_inactive"])
 		if !ok || userMap == nil || len(*userMap) == 0 {
 			return &ViewCondition{}
 		}