wip:接口开发完成提交

jyBXSubscribe/api/bxsubscribe.api

@@ -154,6 +154,27 @@ type (
 		PushValue    int64    `json:"pushValue,optional"`
 		Interested   int64    `json:"interested,optional"`
 	}
+	GetStaffSubscribeListReq {
+		AppId     string `header:"appId"`
+		EntId     int64  `header:"entId,optional"`
+		EntUserId int64  `header:"entUserId,optional"`
+		EStatus   int64  `json:"e_status,optional"`
+		PStatus   int64  `json:"p_status,optional"`
+		Search    string `json:"search,optional"`
+		PageNum   int64  `json:"pageNum,optional"`
+		PageSize  int64  `json:"pageSize,optional"`
+	}
+	GetStaffSubscribeDetailReq {
+		AppId     string `header:"appId"`
+		EntId     int64  `header:"entId,optional"`
+		EntUserId int64  `header:"entUserId,optional"`
+		StaffId   int64  `json:"staffId,optional"`
+	}
+	StaffSubscribeCommonResp {
+		Err_code int64       `json:"error_code"`
+		Err_msg  string      `json:"error_msg"`
+		Data     interface{} `json:"data"`
+	}
 )
 service bxsubscribe-api {
 	@handler subscribeList
@@ -182,4 +203,8 @@ service bxsubscribe-api {
 	post /jybx/subscribe/getPushSet (GetUserReq) returns (commonResp)
 	@handler setPushSet  //推送设置修改
 	post /jybx/subscribe/setPushSet (SetPushSetReq) returns (commonResp)
+	@handler getStaffSubscribeList //查询企业员工订阅状态
+	post /jybx/subscribe/getStaffSubscribe (GetStaffSubscribeListReq) returns (StaffSubscribeCommonResp)
+	@handler getStaffSubscribeDetail //查询企业员工订阅详情
+	post /jybx/subscribe/getStaffSubscribeDetail (GetStaffSubscribeDetailReq) returns (StaffSubscribeCommonResp)
 }

jyBXSubscribe/api/internal/handler/routes.go

@@ -77,6 +77,16 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/jybx/subscribe/setPushSet",
 				Handler: setPushSetHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/jybx/subscribe/getStaffSubscribe",
+				Handler: getStaffSubscribeListHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/jybx/subscribe/getStaffSubscribeDetail",
+				Handler: getStaffSubscribeDetailHandler(serverCtx),
+			},
 		},
 	)
 }

jyBXSubscribe/api/internal/types/types.go

@@ -154,3 +154,27 @@ type SetPushSetReq struct {
 	PushValue    int64    `json:"pushValue,optional"`
 	Interested   int64    `json:"interested,optional"`
 }
+
+type GetStaffSubscribeListReq struct {
+	AppId     string `header:"appId"`
+	EntId     int64  `header:"entId,optional"`
+	EntUserId int64  `header:"entUserId,optional"`
+	EStatus   int64  `json:"e_status,optional"`
+	PStatus   int64  `json:"p_status,optional"`
+	Search    string `json:"search,optional"`
+	PageNum   int64  `json:"pageNum,optional"`
+	PageSize  int64  `json:"pageSize,optional"`
+}
+
+type GetStaffSubscribeDetailReq struct {
+	AppId     string `header:"appId"`
+	EntId     int64  `header:"entId,optional"`
+	EntUserId int64  `header:"entUserId,optional"`
+	StaffId   int64  `json:"staffId,optional"`
+}
+
+type StaffSubscribeCommonResp struct {
+	Err_code int64       `json:"error_code"`
+	Err_msg  string      `json:"error_msg"`
+	Data     interface{} `json:"data"`
+}

jyBXSubscribe/rpc/bxsubscribe.go

@@ -27,6 +27,7 @@ var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var logFile = flag.String("lf", "etc/logs.yaml", "the log file")
 
 func main() {
+
 	//初始化基本配置
 	g.Cfg().GetAdapter().(*gcfg.AdapterFile).SetFileName("etc/config.yaml")
 	conf.MustLoad(*configF, &IC.C)
@@ -35,7 +36,17 @@ func main() {
 	//初始化日志信息
 	conf.MustLoad(*logFile, &IC.Logc)
 	IC.InitC()
-	//
+
+	//total, list := model.GetStaffSubscribeList(15241, 4967, "", 0, 0, 0, 5)
+	//total, list := model.GetStaffSubscribeList(14650, 3680, "", 0, -1, 0, 5)
+	//fmt.Println(total)
+	//if total > 0 {
+	//	for _, i2 := range list {
+	//		g.Dump(i2)
+	//	}
+	//}
+	//g.Dump(model.GetStaffSubscribeDetail(14650, 4916))
+
 	go func() {
 		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
 		if err != nil {

jyBXSubscribe/rpc/bxsubscribe/bxsubscribe.go

@@ -13,45 +13,50 @@ import (
 )
 
 type (
-	ByPushHistoryResp      = bxsubscribe.ByPushHistoryResp
-	CityList               = bxsubscribe.CityList
-	DistributorResp        = bxsubscribe.DistributorResp
-	GetDistributorReq      = bxsubscribe.GetDistributorReq
-	GetKeyReq              = bxsubscribe.GetKeyReq
-	GetPushSetReq          = bxsubscribe.GetPushSetReq
-	GetPushSetResp         = bxsubscribe.GetPushSetResp
-	GetUserInfo            = bxsubscribe.GetUserInfo
-	GetUserInfoReq         = bxsubscribe.GetUserInfoReq
-	GetUserInfoResq        = bxsubscribe.GetUserInfoResq
-	GetViewStatusReq       = bxsubscribe.GetViewStatusReq
-	Items                  = bxsubscribe.Items
-	Key                    = bxsubscribe.Key
-	KeyItems               = bxsubscribe.KeyItems
-	KeyResp                = bxsubscribe.KeyResp
-	Keys                   = bxsubscribe.Keys
-	List                   = bxsubscribe.List
-	MsgDistributorReq      = bxsubscribe.MsgDistributorReq
-	PushSet                = bxsubscribe.PushSet
-	SetPushSetReq          = bxsubscribe.SetPushSetReq
-	SetReadReq             = bxsubscribe.SetReadReq
-	SetUserInfoReq         = bxsubscribe.SetUserInfoReq
-	SomeInfo               = bxsubscribe.SomeInfo
-	SomeInfoReq            = bxsubscribe.SomeInfoReq
-	SomeInfoResp           = bxsubscribe.SomeInfoResp
-	StatusResp             = bxsubscribe.StatusResp
-	Subscribe              = bxsubscribe.Subscribe
-	SubscribeData          = bxsubscribe.SubscribeData
-	SubscribeInfo          = bxsubscribe.SubscribeInfo
-	SubscribeInfosReq      = bxsubscribe.SubscribeInfosReq
-	SubscribeInfosResp     = bxsubscribe.SubscribeInfosResp
-	TimeJson               = bxsubscribe.TimeJson
-	UpdateSubScribeInfoReq = bxsubscribe.UpdateSubScribeInfoReq
-	UserReq                = bxsubscribe.UserReq
-	UserResp               = bxsubscribe.UserResp
-	UserResq               = bxsubscribe.UserResq
-	UserStatus             = bxsubscribe.UserStatus
-	ViewStatusResp         = bxsubscribe.ViewStatusResp
-	WinnerInfo             = bxsubscribe.WinnerInfo
+	ByPushHistoryResp       = bxsubscribe.ByPushHistoryResp
+	CityList                = bxsubscribe.CityList
+	DistributorResp         = bxsubscribe.DistributorResp
+	GetDistributorReq       = bxsubscribe.GetDistributorReq
+	GetKeyReq               = bxsubscribe.GetKeyReq
+	GetPushSetReq           = bxsubscribe.GetPushSetReq
+	GetPushSetResp          = bxsubscribe.GetPushSetResp
+	GetUserInfo             = bxsubscribe.GetUserInfo
+	GetUserInfoReq          = bxsubscribe.GetUserInfoReq
+	GetUserInfoResq         = bxsubscribe.GetUserInfoResq
+	GetViewStatusReq        = bxsubscribe.GetViewStatusReq
+	Items                   = bxsubscribe.Items
+	Key                     = bxsubscribe.Key
+	KeyItems                = bxsubscribe.KeyItems
+	KeyResp                 = bxsubscribe.KeyResp
+	Keys                    = bxsubscribe.Keys
+	List                    = bxsubscribe.List
+	MsgDistributorReq       = bxsubscribe.MsgDistributorReq
+	PushSet                 = bxsubscribe.PushSet
+	SetPushSetReq           = bxsubscribe.SetPushSetReq
+	SetReadReq              = bxsubscribe.SetReadReq
+	SetUserInfoReq          = bxsubscribe.SetUserInfoReq
+	SomeInfo                = bxsubscribe.SomeInfo
+	SomeInfoReq             = bxsubscribe.SomeInfoReq
+	SomeInfoResp            = bxsubscribe.SomeInfoResp
+	StaffSubscribe          = bxsubscribe.StaffSubscribe
+	StaffSubscribeDetail    = bxsubscribe.StaffSubscribeDetail
+	StaffSubscribeDetailReq = bxsubscribe.StaffSubscribeDetailReq
+	StaffSubscribeListResp  = bxsubscribe.StaffSubscribeListResp
+	StaffSubscribeReq       = bxsubscribe.StaffSubscribeReq
+	StatusResp              = bxsubscribe.StatusResp
+	Subscribe               = bxsubscribe.Subscribe
+	SubscribeData           = bxsubscribe.SubscribeData
+	SubscribeInfo           = bxsubscribe.SubscribeInfo
+	SubscribeInfosReq       = bxsubscribe.SubscribeInfosReq
+	SubscribeInfosResp      = bxsubscribe.SubscribeInfosResp
+	TimeJson                = bxsubscribe.TimeJson
+	UpdateSubScribeInfoReq  = bxsubscribe.UpdateSubScribeInfoReq
+	UserReq                 = bxsubscribe.UserReq
+	UserResp                = bxsubscribe.UserResp
+	UserResq                = bxsubscribe.UserResq
+	UserStatus              = bxsubscribe.UserStatus
+	ViewStatusResp          = bxsubscribe.ViewStatusResp
+	WinnerInfo              = bxsubscribe.WinnerInfo
 
 	Bxsubscribe interface {
 		// 获取订阅推送列表
@@ -82,6 +87,10 @@ type (
 		GetPushSet(ctx context.Context, in *GetPushSetReq, opts ...grpc.CallOption) (*GetPushSetResp, error)
 		// 用户推送设置修改
 		SetPushSet(ctx context.Context, in *SetPushSetReq, opts ...grpc.CallOption) (*StatusResp, error)
+		// 查看企业员工用户订阅
+		GetStaffSubscribeList(ctx context.Context, in *StaffSubscribeReq, opts ...grpc.CallOption) (*StaffSubscribeListResp, error)
+		// 查看企业员工用户订阅详情
+		GetStaffSubscribeDetail(ctx context.Context, in *StaffSubscribeDetailReq, opts ...grpc.CallOption) (*StaffSubscribeDetail, error)
 	}
 
 	defaultBxsubscribe struct {
@@ -178,3 +187,15 @@ func (m *defaultBxsubscribe) SetPushSet(ctx context.Context, in *SetPushSetReq,
 	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
 	return client.SetPushSet(ctx, in, opts...)
 }
+
+// 查看企业员工用户订阅
+func (m *defaultBxsubscribe) GetStaffSubscribeList(ctx context.Context, in *StaffSubscribeReq, opts ...grpc.CallOption) (*StaffSubscribeListResp, error) {
+	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
+	return client.GetStaffSubscribeList(ctx, in, opts...)
+}
+
+// 查看企业员工用户订阅详情
+func (m *defaultBxsubscribe) GetStaffSubscribeDetail(ctx context.Context, in *StaffSubscribeDetailReq, opts ...grpc.CallOption) (*StaffSubscribeDetail, error) {
+	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
+	return client.GetStaffSubscribeDetail(ctx, in, opts...)
+}

jyBXSubscribe/rpc/internal/server/bxsubscribeserver.go

@@ -105,3 +105,15 @@ func (s *BxsubscribeServer) SetPushSet(ctx context.Context, in *bxsubscribe.SetP
 	l := logic.NewSetPushSetLogic(ctx, s.svcCtx)
 	return l.SetPushSet(in)
 }
+
+// 查看企业员工用户订阅
+func (s *BxsubscribeServer) GetStaffSubscribeList(ctx context.Context, in *bxsubscribe.StaffSubscribeReq) (*bxsubscribe.StaffSubscribeListResp, error) {
+	l := logic.NewGetStaffSubscribeListLogic(ctx, s.svcCtx)
+	return l.GetStaffSubscribeList(in)
+}
+
+// 查看企业员工用户订阅详情
+func (s *BxsubscribeServer) GetStaffSubscribeDetail(ctx context.Context, in *bxsubscribe.StaffSubscribeDetailReq) (*bxsubscribe.StaffSubscribeDetail, error) {
+	l := logic.NewGetStaffSubscribeDetailLogic(ctx, s.svcCtx)
+	return l.GetStaffSubscribeDetail(in)
+}

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	IC "jyBXSubscribe/rpc/init"
+	"jyBXSubscribe/rpc/type/bxsubscribe"
 	"strings"
 )
 
@@ -12,7 +13,7 @@ import (
 // query 检索名字/手机号
 // eStatus 是否有企业订阅 -1 无企业订阅 1 有企业订阅
 // pStatus 是否有个人订阅 -1 无个人订阅 1 有个人订阅
-func GetStaffSubscribeList(entId, entUserId int, query string, eStatus, pStatus, pageNum, pageSize int) (total int64, list []interface{}) {
+func GetStaffSubscribeList(entId, entUserId int, query string, eStatus, pStatus, pageNum, pageSize int64) (total int64, list []*bxsubscribe.StaffSubscribe) {
 	userEnt := EntInfo(entId, entUserId)
 	// 非管理员无权限查询
 	if !(userEnt.Role_admin_system || userEnt.Role_admin_department) {
@@ -62,7 +63,7 @@ func GetStaffSubscribeList(entId, entUserId int, query string, eStatus, pStatus,
 	countSql := fmt.Sprintf("SELECT count(e.id) %s  %s", sql, strings.Join(queryArr, " AND "))
 	total = IC.MainMysql.CountBySql(countSql, valueArr...)
 	if total > 0 {
-		finalSql := fmt.Sprintf("SELECT e.id,e.name,e.phone,r.rule_id %s  %s ORDER BY e.createtime DESC  LIMIT %d,%d", sql, strings.Join(queryArr, " AND "), common.If(pageNum >= 0, pageNum, 0).(int)*pageSize, pageSize)
+		finalSql := fmt.Sprintf("SELECT e.id,e.name,e.phone,r.rule_id %s  %s ORDER BY e.createtime DESC  LIMIT %d,%d", sql, strings.Join(queryArr, " AND "), common.If(pageNum >= 0, pageNum, 0).(int64)*pageSize, pageSize)
 		finalRes := IC.MainMysql.SelectBySql(finalSql, valueArr...)
 		if finalRes != nil && len(*finalRes) > 0 {
 			for _, m := range *finalRes {
@@ -74,12 +75,12 @@ func GetStaffSubscribeList(entId, entUserId int, query string, eStatus, pStatus,
 						break
 					}
 				}
-				list = append(list, map[string]interface{}{
-					"id":      m["id"],
-					"name":    common.ObjToString(m["name"]),
-					"phone":   common.ObjToString(m["phone"]),
-					"eStatus": common.If(common.ObjToString(m["rule_id"]) == "", -1, 1),
-					"pStatus": common.If(hasPersonSubscribe, 1, -1),
+				list = append(list, &bxsubscribe.StaffSubscribe{
+					Name:    common.ObjToString(m["name"]),
+					Id:      gconv.Int64(m["id"]),
+					Phone:   common.ObjToString(m["phone"]),
+					EStatus: gconv.Int64(common.If(common.ObjToString(m["rule_id"]) == "", -1, 1)),
+					PStatus: gconv.Int64(common.If(hasPersonSubscribe, 1, -1)),
 				})
 			}
 		}
@@ -137,18 +138,18 @@ func getEntPersonOrderList(entId int) (uIds []int64) {
 }
 
 // GetStaffSubscribeDetail 获取企业个人订阅
-func GetStaffSubscribeDetail(entId, uid int64) (rData map[string]interface{}) {
+func GetStaffSubscribeDetail(entId, uid, staffId int64) (rData map[string]interface{}, err error) {
 	rData = map[string]interface{}{}
 	//个人订阅
-	if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": uid, "i_type": 2}); data != nil && len(data) > 0 {
+	if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 2}); data != nil && len(data) > 0 {
 		rData["个人订阅"] = data
 	}
 	//个人订阅商机管理
-	if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": uid, "i_type": map[string]interface{}{"$exists": 0}}); data != nil && len(data) > 0 {
+	if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 0}); data != nil && len(data) > 0 {
 		rData["个人订阅<br>商机管理"] = data
 	}
 	//大会员或超级订阅企业版
-	if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": uid, "i_type": map[string]interface{}{"$exists": 0}}); data != nil && len(data) > 0 {
+	if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 1}); data != nil && len(data) > 0 {
 		key := "企业版"
 		//查询企业版是大会员还是超级订阅
 		if vipRes := IC.MainMysql.FindOne("entniche_wait_empower", map[string]interface{}{"ent_id": entId}, "product_type", "id desc"); vipRes != nil && len(*vipRes) > 0 {
@@ -162,10 +163,10 @@ func GetStaffSubscribeDetail(entId, uid int64) (rData map[string]interface{}) {
 		rData[fmt.Sprintf("个人订阅<br>%s", key)] = data
 	}
 	// 企业自动分发
-	if data := getEntDistribute(entId, uid); data != nil && len(data) > 0 {
+	if data := getEntDistribute(entId, staffId); data != nil && len(data) > 0 {
 		rData["企业自动分发"] = data
 	}
-	return rData
+	return
 }
 
 // getPersonSubscribe 个人订阅

jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe_grpc.pb.go

@@ -19,20 +19,22 @@ import (
 const _ = grpc.SupportPackageIsVersion7
 
 const (
-	Bxsubscribe_GetSubList_FullMethodName          = "/bxsubscribe.Bxsubscribe/GetSubList"
-	Bxsubscribe_GetSubSomeInfo_FullMethodName      = "/bxsubscribe.Bxsubscribe/GetSubSomeInfo"
-	Bxsubscribe_UpdateSubScribeInfo_FullMethodName = "/bxsubscribe.Bxsubscribe/UpdateSubScribeInfo"
-	Bxsubscribe_ByPushHistory_FullMethodName       = "/bxsubscribe.Bxsubscribe/ByPushHistory"
-	Bxsubscribe_SetRead_FullMethodName             = "/bxsubscribe.Bxsubscribe/SetRead"
-	Bxsubscribe_GetKey_FullMethodName              = "/bxsubscribe.Bxsubscribe/GetKey"
-	Bxsubscribe_GetSubScribeInfo_FullMethodName    = "/bxsubscribe.Bxsubscribe/GetSubScribeInfo"
-	Bxsubscribe_MsgDistributor_FullMethodName      = "/bxsubscribe.Bxsubscribe/MsgDistributor"
-	Bxsubscribe_GetDistributor_FullMethodName      = "/bxsubscribe.Bxsubscribe/GetDistributor"
-	Bxsubscribe_GetViewStatus_FullMethodName       = "/bxsubscribe.Bxsubscribe/GetViewStatus"
-	Bxsubscribe_UserInfo_FullMethodName            = "/bxsubscribe.Bxsubscribe/userInfo"
-	Bxsubscribe_SetUser_FullMethodName             = "/bxsubscribe.Bxsubscribe/setUser"
-	Bxsubscribe_GetPushSet_FullMethodName          = "/bxsubscribe.Bxsubscribe/getPushSet"
-	Bxsubscribe_SetPushSet_FullMethodName          = "/bxsubscribe.Bxsubscribe/setPushSet"
+	Bxsubscribe_GetSubList_FullMethodName              = "/bxsubscribe.Bxsubscribe/GetSubList"
+	Bxsubscribe_GetSubSomeInfo_FullMethodName          = "/bxsubscribe.Bxsubscribe/GetSubSomeInfo"
+	Bxsubscribe_UpdateSubScribeInfo_FullMethodName     = "/bxsubscribe.Bxsubscribe/UpdateSubScribeInfo"
+	Bxsubscribe_ByPushHistory_FullMethodName           = "/bxsubscribe.Bxsubscribe/ByPushHistory"
+	Bxsubscribe_SetRead_FullMethodName                 = "/bxsubscribe.Bxsubscribe/SetRead"
+	Bxsubscribe_GetKey_FullMethodName                  = "/bxsubscribe.Bxsubscribe/GetKey"
+	Bxsubscribe_GetSubScribeInfo_FullMethodName        = "/bxsubscribe.Bxsubscribe/GetSubScribeInfo"
+	Bxsubscribe_MsgDistributor_FullMethodName          = "/bxsubscribe.Bxsubscribe/MsgDistributor"
+	Bxsubscribe_GetDistributor_FullMethodName          = "/bxsubscribe.Bxsubscribe/GetDistributor"
+	Bxsubscribe_GetViewStatus_FullMethodName           = "/bxsubscribe.Bxsubscribe/GetViewStatus"
+	Bxsubscribe_UserInfo_FullMethodName                = "/bxsubscribe.Bxsubscribe/userInfo"
+	Bxsubscribe_SetUser_FullMethodName                 = "/bxsubscribe.Bxsubscribe/setUser"
+	Bxsubscribe_GetPushSet_FullMethodName              = "/bxsubscribe.Bxsubscribe/getPushSet"
+	Bxsubscribe_SetPushSet_FullMethodName              = "/bxsubscribe.Bxsubscribe/setPushSet"
+	Bxsubscribe_GetStaffSubscribeList_FullMethodName   = "/bxsubscribe.Bxsubscribe/getStaffSubscribeList"
+	Bxsubscribe_GetStaffSubscribeDetail_FullMethodName = "/bxsubscribe.Bxsubscribe/getStaffSubscribeDetail"
 )
 
 // BxsubscribeClient is the client API for Bxsubscribe service.
@@ -67,6 +69,10 @@ type BxsubscribeClient interface {
 	GetPushSet(ctx context.Context, in *GetPushSetReq, opts ...grpc.CallOption) (*GetPushSetResp, error)
 	// 用户推送设置修改
 	SetPushSet(ctx context.Context, in *SetPushSetReq, opts ...grpc.CallOption) (*StatusResp, error)
+	// 查看企业员工用户订阅
+	GetStaffSubscribeList(ctx context.Context, in *StaffSubscribeReq, opts ...grpc.CallOption) (*StaffSubscribeListResp, error)
+	// 查看企业员工用户订阅详情
+	GetStaffSubscribeDetail(ctx context.Context, in *StaffSubscribeDetailReq, opts ...grpc.CallOption) (*StaffSubscribeDetail, error)
 }
 
 type bxsubscribeClient struct {
@@ -203,6 +209,24 @@ func (c *bxsubscribeClient) SetPushSet(ctx context.Context, in *SetPushSetReq, o
 	return out, nil
 }
 
+func (c *bxsubscribeClient) GetStaffSubscribeList(ctx context.Context, in *StaffSubscribeReq, opts ...grpc.CallOption) (*StaffSubscribeListResp, error) {
+	out := new(StaffSubscribeListResp)
+	err := c.cc.Invoke(ctx, Bxsubscribe_GetStaffSubscribeList_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *bxsubscribeClient) GetStaffSubscribeDetail(ctx context.Context, in *StaffSubscribeDetailReq, opts ...grpc.CallOption) (*StaffSubscribeDetail, error) {
+	out := new(StaffSubscribeDetail)
+	err := c.cc.Invoke(ctx, Bxsubscribe_GetStaffSubscribeDetail_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // BxsubscribeServer is the server API for Bxsubscribe service.
 // All implementations must embed UnimplementedBxsubscribeServer
 // for forward compatibility
@@ -235,6 +259,10 @@ type BxsubscribeServer interface {
 	GetPushSet(context.Context, *GetPushSetReq) (*GetPushSetResp, error)
 	// 用户推送设置修改
 	SetPushSet(context.Context, *SetPushSetReq) (*StatusResp, error)
+	// 查看企业员工用户订阅
+	GetStaffSubscribeList(context.Context, *StaffSubscribeReq) (*StaffSubscribeListResp, error)
+	// 查看企业员工用户订阅详情
+	GetStaffSubscribeDetail(context.Context, *StaffSubscribeDetailReq) (*StaffSubscribeDetail, error)
 	mustEmbedUnimplementedBxsubscribeServer()
 }
 
@@ -284,6 +312,12 @@ func (UnimplementedBxsubscribeServer) GetPushSet(context.Context, *GetPushSetReq
 func (UnimplementedBxsubscribeServer) SetPushSet(context.Context, *SetPushSetReq) (*StatusResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetPushSet not implemented")
 }
+func (UnimplementedBxsubscribeServer) GetStaffSubscribeList(context.Context, *StaffSubscribeReq) (*StaffSubscribeListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetStaffSubscribeList not implemented")
+}
+func (UnimplementedBxsubscribeServer) GetStaffSubscribeDetail(context.Context, *StaffSubscribeDetailReq) (*StaffSubscribeDetail, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetStaffSubscribeDetail not implemented")
+}
 func (UnimplementedBxsubscribeServer) mustEmbedUnimplementedBxsubscribeServer() {}
 
 // UnsafeBxsubscribeServer may be embedded to opt out of forward compatibility for this service.
@@ -549,6 +583,42 @@ func _Bxsubscribe_SetPushSet_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bxsubscribe_GetStaffSubscribeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StaffSubscribeReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BxsubscribeServer).GetStaffSubscribeList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Bxsubscribe_GetStaffSubscribeList_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BxsubscribeServer).GetStaffSubscribeList(ctx, req.(*StaffSubscribeReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Bxsubscribe_GetStaffSubscribeDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StaffSubscribeDetailReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BxsubscribeServer).GetStaffSubscribeDetail(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Bxsubscribe_GetStaffSubscribeDetail_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BxsubscribeServer).GetStaffSubscribeDetail(ctx, req.(*StaffSubscribeDetailReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Bxsubscribe_ServiceDesc is the grpc.ServiceDesc for Bxsubscribe service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -612,6 +682,14 @@ var Bxsubscribe_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "setPushSet",
 			Handler:    _Bxsubscribe_SetPushSet_Handler,
 		},
+		{
+			MethodName: "getStaffSubscribeList",
+			Handler:    _Bxsubscribe_GetStaffSubscribeList_Handler,
+		},
+		{
+			MethodName: "getStaffSubscribeDetail",
+			Handler:    _Bxsubscribe_GetStaffSubscribeDetail_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "bxsubscribe.proto",