|
|
@@ -1754,7 +1754,7 @@ 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,"subpush_inactive":1}`)
|
|
|
+ userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_member_jy":1,"i_member_status":1,"i_member_sub_status":1,"s_member_mainid": 1,"subpush_inactive":1}`)
|
|
|
spqp.SubPushInactive = common.IntAll((*userMap)["subpush_inactive"])
|
|
|
if !ok || userMap == nil || len(*userMap) == 0 {
|
|
|
return &ViewCondition{}
|
|
|
@@ -1762,6 +1762,10 @@ func (s *subscribePush) GetUserInfo(spqp *SubPushQueryParam) (vc *ViewCondition)
|
|
|
//大会员
|
|
|
if common.IntAll((*userMap)["i_member_status"]) > 0 {
|
|
|
isPayBool = true
|
|
|
+ if gconv.Int((*userMap)["i_member_sub_status"]) == 1 { // 子账号取主账号订阅设置
|
|
|
+ zid := gconv.String((*userMap)["s_member_mainid"])
|
|
|
+ userMap, _ = IC.Mgo.FindById("user", zid, `{"o_member_jy":1,"i_member_status":1,"subpush_inactive":1}`)
|
|
|
+ }
|
|
|
o_member_jy, _ := (*userMap)["o_member_jy"].(map[string]interface{})
|
|
|
tmpInfo.Items, _ = o_member_jy["a_items"].([]interface{})
|
|
|
tmpInfo.BuyerClass, _ = o_member_jy["a_buyerclass"].([]interface{})
|
