|
|
@@ -1369,7 +1369,7 @@ func (s *subscribePush) Keys(spqp *KeyParam) (result []*bxsubscribe.KeyItems) {
|
|
|
if !spqp.IsEnt {
|
|
|
//个人关键词查找
|
|
|
//fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户
|
|
|
- mData, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_jy":1,"o_vipjy":1,"o_member_jy":1}`)
|
|
|
+ mData, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_jy":1,"o_vipjy":1,"o_member_jy":1,""i_member_sub_status":1,"s_member_mainid":1}`)
|
|
|
if s.ModuleFlag == SubVipFlag {
|
|
|
//从user表中取 o_vipjy.a_items
|
|
|
if mData == nil || len(*mData) == 0 || !ok {
|
|
|
@@ -1390,6 +1390,14 @@ func (s *subscribePush) Keys(spqp *KeyParam) (result []*bxsubscribe.KeyItems) {
|
|
|
if mData == nil || len(*mData) == 0 || !ok {
|
|
|
return nil
|
|
|
}
|
|
|
+ sub_status := common.Int64All((*mData)["i_member_sub_status"])
|
|
|
+ if sub_status == 1 {
|
|
|
+ //大会员子账号处理
|
|
|
+ mData, ok = IC.Mgo.FindById("user", common.InterfaceToStr((*mData)["s_member_mainid"]), `{"o_jy":1,"o_vipjy":1,"o_member_jy":1,""i_member_sub_status":1,"s_member_mainid":1}`)
|
|
|
+ if mData == nil || len(*mData) == 0 || !ok {
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
o_memeberjy := common.ObjToMap((*mData)["o_member_jy"])
|
|
|
if (*o_memeberjy)["a_items"] != nil {
|
|
|
a_items := common.ObjArrToMapArr((*o_memeberjy)["a_items"].([]interface{}))
|
WH01243