feat:我的订阅向导

jyBXSubscribe/rpc/internal/logic/getsubsomeinfologic.go

@@ -74,8 +74,19 @@ func (l *GetSubSomeInfoLogic) GetSubSomeInfo(in *bxsubscribe.SomeInfoReq) (*bxsu
 			}
 			resp.Data.IsPassCount = redis.GetInt("pushcache_2_a", "oncecount_"+todayNum+"_"+in.UserId) >= 150
 		}
+		//是否进入向导查询
+		resp.Data.IsInTSguide = func() bool {
+			//付费用户无免费订阅，不进入订阅向导页面
+			if common.IntAll((*user)["i_member_status"]) > 0 || common.IntAll((*user)["i_vip_status"]) > 0 {
+				return false
+			}
+			o_jy, _ := (*user)["o_jy"].(map[string]interface{})
+			iTsGuide := common.IntAll((*user)["i_ts_guide"])
+			if iTsGuide == 2 || (iTsGuide == 0 && len(o_jy) == 0) {
+				return true
+			}
+			return false
+		}()
 	}
-	//是否进入想到查询
-	resp.Data.IsInTSguide = model.NewSubscribePush().IsInTsGuide(in.UserId)
 	return resp, nil
 }

jyBXSubscribe/rpc/model/push.go

@@ -964,7 +964,7 @@ func (s *subscribePush) SetRead(newUserId, id int64, userId, entUserId, entId st
 
 // UserInfo 获取用户信息
 func (s *subscribePush) UserInfo(baseUserId int64) (*map[string]interface{}, int64) {
-	user, ok := IC.Mgo.FindOneByField("user", map[string]interface{}{"base_user_id": baseUserId}, `{"s_m_openid":1,"a_m_openid":1,"s_phone":1,"a_mergeorder":1,"o_jy":1,"l_firstpushtime":1,"i_vip_status":1,"l_vip_endtime":1,"o_vipjy":1,"i_member_status":1,"o_member_jy":1}`)
+	user, ok := IC.Mgo.FindOneByField("user", map[string]interface{}{"base_user_id": baseUserId}, `{"i_ts_guide":1,"s_m_openid":1,"a_m_openid":1,"s_phone":1,"a_mergeorder":1,"o_jy":1,"l_firstpushtime":1,"i_vip_status":1,"l_vip_endtime":1,"o_vipjy":1,"i_member_status":1,"o_member_jy":1}`)
 	if !ok || user == nil {
 		return nil, 0
 	}