分支合并

jyBXBase/rpc/init/db.go

@@ -17,7 +17,6 @@ import (
 var (
 	MainMysql        *mysql.Mysql
 	BaseServiceMysql *mysql.Mysql
-	PushMysql        *mysql.Mysql
 	Mgo              mongodb.MongodbSim
 	MgoEnt           mongodb.MongodbSim
 	MgoBidding       mongodb.MongodbSim

jyBXBase/rpc/model/newestBidding.go

@@ -25,7 +25,7 @@ const (
 	query_bool_must     = `{"terms":{"%s":[%s]}}`
 	query_bool_must_and = `{"bool":{"must":[%s],"must_not":[%s]}}`
 	search_field        = `"_id","area", "publishtime", "s_subscopeclass", "subtype", "title", "toptype", "type", "buyerclass","bidamount","budget","projectname","buyer","bidopentime","s_winner","filetext","isValidFile","spidercode","site"`
-	query_city_hkeys    = `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match": 1}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":50}`
+	query_city_hkeys    = `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match":%d}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":50}`
 	Pushbidding         = "global_common_data.dws_f_bid_baseinfo"
 	Province            = "province"
 )
@@ -176,7 +176,11 @@ func NewestQuery(city, keys, subtype string) (str string) {
 	if subtype != "" {
 		musts = append(musts, fmt.Sprintf(query_bool_must, "subtype", subtype))
 	}
-	str = fmt.Sprintf(query_city_hkeys, strings.Join(musts, ","), strings.Join(bools, ","))
+	minimum_should_match := 0
+	if len(bools) > 0 {
+		minimum_should_match = 1
+	}
+	str = fmt.Sprintf(query_city_hkeys, strings.Join(musts, ","), strings.Join(bools, ","), minimum_should_match)
 	logx.Info("str:", str)
 	return
 }

jyBXSubscribe/api/bxsubscribe.api

@@ -10,6 +10,7 @@ info (
 type (
 	//订阅列表
 	subscribeReq {
+<<<<<<< HEAD
 		AppId        string `header:"appId"`
 		UserId       string `header:"userId"`
 		EntId        string `header:"entId,optional"`
@@ -37,6 +38,34 @@ type (
 		MgoUserId    string `header:"mgoUserId,optional"`  //原userId
 		AccountId    string `header:"accountId,optional"`  //账户id
 		PositionId   string `header:"positionId,optional"` //职位id
+=======
+		AppId          string                 `header:"appId"`
+		UserId         string                 `header:"userId"`
+		EntId          string                 `header:"entId,optional"`
+		EntUserId      string                 `header:"entUserId,optional"`
+		DeptId         string                 `header:"deptId,optional"` //部门id
+		PageNum        int64                  `json:"pageNum,optional"`
+		PageSize       int64                  `json:"pageSize,optional"`
+		SelectTime     string                 `json:"selectTime,optional"`
+		Area           string                 `json:"area,optional"`
+		City           string                 `json:"city,optional"`
+		Industry       string                 `json:"industry,optional"`
+		BuyerClass     string                 `json:"buyerClass,optional"`
+		KeyWords       string                 `json:"keyWords,optional"`
+		Subtype        string                 `json:"subtype,optional"`
+		Price          string                 `json:"price,optional"`
+		FileExists     string                 `json:"fileExists,optional"`
+		Source         string                 `json:"source,optional"`                                        //信息来源
+		IsRead         string                 `json:"isRead,optional"`                                        //是否已读
+		Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
+		UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
+		NewUserId      int64                  `header:"newUserId"`
+		IsEnt          bool                   `json:"isEnt,optional"`
+		SelectIds      string                 `json:"selectIds,optional"`
+		PositionType   int64                  `header:"positionType,optional"`
+		NotReturnCount int64                  `json:"notReturnCount,optional"`
+		Item           map[string]interface{} `json:"item,optional"`
+>>>>>>> master
 	}
 	//
 	someInfoReq {

jyBXSubscribe/api/internal/logic/byPushHistoryLogic.go

@@ -1,8 +1,10 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"jyBXSubscribe/rpc/type/bxsubscribe"
+	"strings"
 
 	"jyBXSubscribe/api/internal/svc"
 	"jyBXSubscribe/api/internal/types"
@@ -25,30 +27,55 @@ func NewByPushHistoryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ByP
 }
 
 func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types.CommonResp, err error) {
+	//关键词处理
+	//分类
+	matchitemsArr := []string{}
+	matchitems := ""
+	//关键词
+	matchkeysArr := []string{}
+	matchkeys := ""
+	if req.IsEnt {
+		for k, v := range req.Item {
+			if common.InterfaceToStr(v) == "" {
+				matchitemsArr = append(matchitemsArr, common.InterfaceToStr(k))
+			} else {
+				matchkeysArr = append(matchkeysArr, common.InterfaceToStr(v))
+			}
+		}
+		if len(matchitemsArr) == 0 {
+			matchkeys = strings.Join(matchkeysArr, ",")
+		} else {
+			matchitems = strings.Join(matchitemsArr, ",")
+		}
+	} else {
+		matchkeys = req.KeyWords
+	}
 	res, err := l.svcCtx.Suscribe.ByPushHistory(l.ctx, &bxsubscribe.SubscribeInfosReq{
-		PageNum:      req.PageNum,
-		PageSize:     req.PageSize,
-		SelectTime:   req.SelectTime,
-		Area:         req.Area,
-		City:         req.City,
-		Industry:     req.Industry,
-		BuyerClass:   req.BuyerClass,
-		KeyWords:     req.KeyWords,
-		Subtype:      req.Subtype,
-		UserType:     req.UserType,
-		Price:        req.Price,
-		FileExists:   req.FileExists,
-		IsRead:       req.IsRead,
-		Source:       req.Source,
-		Staffs:       req.Staffs,
-		UserId:       req.UserId,
-		EntId:        req.EntId,
-		EntUserId:    req.EntUserId,
-		DeptId:       req.DeptId,
-		NewUserId:    req.NewUserId,
-		IsEnt:        req.IsEnt,
-		SelectIds:    req.SelectIds,
-		PositionType: req.PositionType,
+		PageNum:        req.PageNum,
+		PageSize:       req.PageSize,
+		SelectTime:     req.SelectTime,
+		Area:           req.Area,
+		City:           req.City,
+		Industry:       req.Industry,
+		BuyerClass:     req.BuyerClass,
+		KeyWords:       matchkeys,
+		Subtype:        req.Subtype,
+		UserType:       req.UserType,
+		Price:          req.Price,
+		FileExists:     req.FileExists,
+		IsRead:         req.IsRead,
+		Source:         req.Source,
+		Staffs:         req.Staffs,
+		UserId:         req.UserId,
+		EntId:          req.EntId,
+		EntUserId:      req.EntUserId,
+		DeptId:         req.DeptId,
+		NewUserId:      req.NewUserId,
+		IsEnt:          req.IsEnt,
+		SelectIds:      req.SelectIds,
+		PositionType:   req.PositionType,
+		NotReturnCount: req.NotReturnCount,
+		Item:           matchitems,
 	})
 	if err != nil {
 		return &types.CommonResp{

jyBXSubscribe/api/internal/logic/subscribeListLogic.go

@@ -1,11 +1,13 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"jyBXSubscribe/api/internal/svc"
 	"jyBXSubscribe/api/internal/types"
 	"jyBXSubscribe/rpc/type/bxsubscribe"
 	"net/http"
+	"strings"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -27,7 +29,31 @@ func NewSubscribeListLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *h
 }
 
 func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types.CommonResp, err error) {
+	//关键词处理
+	//分类
+	matchitemsArr := []string{}
+	matchitems := ""
+	//关键词
+	matchkeysArr := []string{}
+	matchkeys := ""
+	if req.IsEnt {
+		for k, v := range req.Item {
+			if common.InterfaceToStr(v) == "" {
+				matchitemsArr = append(matchitemsArr, common.InterfaceToStr(k))
+			} else {
+				matchkeysArr = append(matchkeysArr, common.InterfaceToStr(v))
+			}
+		}
+		if len(matchitemsArr) == 0 {
+			matchkeys = strings.Join(matchkeysArr, ",")
+		} else {
+			matchitems = strings.Join(matchitemsArr, ",")
+		}
+	} else {
+		matchkeys = req.KeyWords
+	}
 	res, err := l.svcCtx.Suscribe.GetSubList(l.ctx, &bxsubscribe.SubscribeInfosReq{
+<<<<<<< HEAD
 		PageNum:      req.PageNum,
 		PageSize:     req.PageSize,
 		SelectTime:   req.SelectTime,
@@ -53,6 +79,32 @@ func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types
 		AccountId:    req.AccountId,
 		PositionId:   req.PositionId,
 		MgoUserId:    req.MgoUserId,
+=======
+		PageNum:        req.PageNum,
+		PageSize:       req.PageSize,
+		SelectTime:     req.SelectTime,
+		Area:           req.Area,
+		City:           req.City,
+		Industry:       req.Industry,
+		BuyerClass:     req.BuyerClass,
+		KeyWords:       matchkeys,
+		Subtype:        req.Subtype,
+		UserType:       req.UserType,
+		Price:          req.Price,
+		FileExists:     req.FileExists,
+		IsRead:         req.IsRead,
+		Source:         req.Source,
+		Staffs:         req.Staffs,
+		UserId:         req.UserId,
+		EntId:          req.EntId,
+		EntUserId:      req.EntUserId,
+		DeptId:         req.DeptId,
+		NewUserId:      req.NewUserId,
+		IsEnt:          req.IsEnt,
+		PositionType:   req.PositionType,
+		NotReturnCount: req.NotReturnCount,
+		Item:           matchitems,
+>>>>>>> master
 	})
 	if err != nil {
 		return &types.CommonResp{

jyBXSubscribe/api/internal/types/types.go

@@ -2,6 +2,7 @@
 package types
 
 type SubscribeReq struct {
+<<<<<<< HEAD
 	AppId        string `header:"appId"`
 	UserId       string `header:"userId"`
 	EntId        string `header:"entId,optional"`
@@ -29,6 +30,34 @@ type SubscribeReq struct {
 	MgoUserId    string `header:"mgoUserId,optional"`  //原userId
 	AccountId    string `header:"accountId,optional"`  //账户id
 	PositionId   string `header:"positionId,optional"` //职位id
+=======
+	AppId          string                 `header:"appId"`
+	UserId         string                 `header:"userId"`
+	EntId          string                 `header:"entId,optional"`
+	EntUserId      string                 `header:"entUserId,optional"`
+	DeptId         string                 `header:"deptId,optional"` //部门id
+	PageNum        int64                  `json:"pageNum,optional"`
+	PageSize       int64                  `json:"pageSize,optional"`
+	SelectTime     string                 `json:"selectTime,optional"`
+	Area           string                 `json:"area,optional"`
+	City           string                 `json:"city,optional"`
+	Industry       string                 `json:"industry,optional"`
+	BuyerClass     string                 `json:"buyerClass,optional"`
+	KeyWords       string                 `json:"keyWords,optional"`
+	Subtype        string                 `json:"subtype,optional"`
+	Price          string                 `json:"price,optional"`
+	FileExists     string                 `json:"fileExists,optional"`
+	Source         string                 `json:"source,optional"`                                        //信息来源
+	IsRead         string                 `json:"isRead,optional"`                                        //是否已读
+	Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
+	UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
+	NewUserId      int64                  `header:"newUserId"`
+	IsEnt          bool                   `json:"isEnt,optional"`
+	SelectIds      string                 `json:"selectIds,optional"`
+	PositionType   int64                  `header:"positionType,optional"`
+	NotReturnCount int64                  `json:"notReturnCount,optional"`
+	Item           map[string]interface{} `json:"item,optional"`
+>>>>>>> master
 }
 
 type SomeInfoReq struct {

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -28,9 +28,14 @@ message SubscribeInfosReq {
   bool IsEnt = 22;
   string SelectIds = 23;
   int64 positionType = 24;
+<<<<<<< HEAD
   string accountId = 25; //账户id
   string positionId = 26;  //职位id
   string mgoUserId = 27;  //原userId
+=======
+  int64 notReturnCount = 25;
+  string item = 26;
+>>>>>>> master
 }
 
 message SubscribeInfosResp {
@@ -276,8 +281,8 @@ message UserStatus {
   int64 isvisit = 3;
   string visittime = 4;
   string date = 5;
-  string phone =6;
-  int64 source =7;
+  string phone = 6;
+  int64 source = 7;
 }
 message GetUserInfoReq{
   string  appId = 1;
@@ -297,8 +302,8 @@ message GetUserInfo{
   string mail = 1;
   int64  state = 2;
   string imgUrl = 3;
-  string appUrl=4;
-  bool   showWx=5;
+  string appUrl = 4;
+  bool   showWx = 5;
 }
 message SetUserInfoReq{
   string  appId = 1;
@@ -321,7 +326,7 @@ message GetPushSetReq{
 
 message GetPushSetResp{
   map<string, PushSet> data = 1;
-  map<int64,TimeJson> timeData=3;
+  map<int64, TimeJson> timeData = 3;
   string error_msg = 4;
   int64 error_code = 5;
 }
@@ -335,8 +340,8 @@ message PushSet{
   int64 i_mailpush = 4;
   int64 i_ratemode = 5;
   int64 isWxShow = 6;
-  int64 interested=7;
-  int64 isMailShow=8;
+  int64 interested = 7;
+  int64 isMailShow = 8;
 }
 message SetPushSetReq{
   string appId = 1;
@@ -361,14 +366,14 @@ message StaffSubscribeReq {
   int64 eStatus = 6;
   int64 pStatus = 7;
   int64 pageNum = 8;
-  int64 pageSize =9;
+  int64 pageSize = 9;
 }
 
 
 message StaffSubscribeListResp {
   int64 err_code = 1;
   string err_msg = 2;
-  int64 total =3;
+  int64 total = 3;
   repeated StaffSubscribe items = 4;
 }
 message StaffSubscribe {
@@ -382,13 +387,13 @@ message StaffSubscribe {
 message StaffSubscribeDetailReq{
   int64  entId = 1;
   int64  entUserId = 2;
-  string  token =3;
+  string  token = 3;
 }
 
 message StaffSubscribeDetail{
   int64 err_code = 1;
   string err_msg = 2;
-  bytes  data =3;
+  bytes  data = 3;
 }
 
 

jyBXSubscribe/rpc/bxsubscribeclient/bxsubscribe.go

@@ -1,201 +0,0 @@
-// Code generated by goctl. DO NOT EDIT.
-// Source: bxsubscribe.proto
-
-package bxsubscribeclient
-
-import (
-	"context"
-
-	"jyBXSubscribe/rpc/type/bxsubscribe"
-
-	"github.com/zeromicro/go-zero/zrpc"
-	"google.golang.org/grpc"
-)
-
-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
-	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 {
-		// 获取订阅推送列表
-		GetSubList(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*SubscribeInfosResp, error)
-		// 获取订阅推送相关信息
-		GetSubSomeInfo(ctx context.Context, in *SomeInfoReq, opts ...grpc.CallOption) (*SomeInfoResp, error)
-		// 修改订阅信息接口
-		UpdateSubScribeInfo(ctx context.Context, in *UpdateSubScribeInfoReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 推送页面筛选导出
-		ByPushHistory(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*ByPushHistoryResp, error)
-		// 推送数据浏览状态修改
-		SetRead(ctx context.Context, in *SetReadReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 关键词获取
-		GetKey(ctx context.Context, in *GetKeyReq, opts ...grpc.CallOption) (*KeyResp, error)
-		// 订阅设置获取
-		GetSubScribeInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResq, error)
-		// 信息分发
-		MsgDistributor(ctx context.Context, in *MsgDistributorReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 手动分发人员查询
-		GetDistributor(ctx context.Context, in *GetDistributorReq, opts ...grpc.CallOption) (*DistributorResp, error)
-		// 查看状态
-		GetViewStatus(ctx context.Context, in *GetViewStatusReq, opts ...grpc.CallOption) (*ViewStatusResp, error)
-		// 用户推送信息查看
-		UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error)
-		// 用户邮箱保存
-		SetUser(ctx context.Context, in *SetUserInfoReq, opts ...grpc.CallOption) (*StatusResp, error)
-		// 用户推送设置查看
-		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 {
-		cli zrpc.Client
-	}
-)
-
-func NewBxsubscribe(cli zrpc.Client) Bxsubscribe {
-	return &defaultBxsubscribe{
-		cli: cli,
-	}
-}
-
-// 获取订阅推送列表
-func (m *defaultBxsubscribe) GetSubList(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*SubscribeInfosResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetSubList(ctx, in, opts...)
-}
-
-// 获取订阅推送相关信息
-func (m *defaultBxsubscribe) GetSubSomeInfo(ctx context.Context, in *SomeInfoReq, opts ...grpc.CallOption) (*SomeInfoResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetSubSomeInfo(ctx, in, opts...)
-}
-
-// 修改订阅信息接口
-func (m *defaultBxsubscribe) UpdateSubScribeInfo(ctx context.Context, in *UpdateSubScribeInfoReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.UpdateSubScribeInfo(ctx, in, opts...)
-}
-
-// 推送页面筛选导出
-func (m *defaultBxsubscribe) ByPushHistory(ctx context.Context, in *SubscribeInfosReq, opts ...grpc.CallOption) (*ByPushHistoryResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.ByPushHistory(ctx, in, opts...)
-}
-
-// 推送数据浏览状态修改
-func (m *defaultBxsubscribe) SetRead(ctx context.Context, in *SetReadReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.SetRead(ctx, in, opts...)
-}
-
-// 关键词获取
-func (m *defaultBxsubscribe) GetKey(ctx context.Context, in *GetKeyReq, opts ...grpc.CallOption) (*KeyResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetKey(ctx, in, opts...)
-}
-
-// 订阅设置获取
-func (m *defaultBxsubscribe) GetSubScribeInfo(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResq, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetSubScribeInfo(ctx, in, opts...)
-}
-
-// 信息分发
-func (m *defaultBxsubscribe) MsgDistributor(ctx context.Context, in *MsgDistributorReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.MsgDistributor(ctx, in, opts...)
-}
-
-// 手动分发人员查询
-func (m *defaultBxsubscribe) GetDistributor(ctx context.Context, in *GetDistributorReq, opts ...grpc.CallOption) (*DistributorResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetDistributor(ctx, in, opts...)
-}
-
-// 查看状态
-func (m *defaultBxsubscribe) GetViewStatus(ctx context.Context, in *GetViewStatusReq, opts ...grpc.CallOption) (*ViewStatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetViewStatus(ctx, in, opts...)
-}
-
-// 用户推送信息查看
-func (m *defaultBxsubscribe) UserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResq, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.UserInfo(ctx, in, opts...)
-}
-
-// 用户邮箱保存
-func (m *defaultBxsubscribe) SetUser(ctx context.Context, in *SetUserInfoReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.SetUser(ctx, in, opts...)
-}
-
-// 用户推送设置查看
-func (m *defaultBxsubscribe) GetPushSet(ctx context.Context, in *GetPushSetReq, opts ...grpc.CallOption) (*GetPushSetResp, error) {
-	client := bxsubscribe.NewBxsubscribeClient(m.cli.Conn())
-	return client.GetPushSet(ctx, in, opts...)
-}
-
-// 用户推送设置修改
-func (m *defaultBxsubscribe) SetPushSet(ctx context.Context, in *SetPushSetReq, opts ...grpc.CallOption) (*StatusResp, error) {
-	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/logic/bypushhistorylogic.go

@@ -67,6 +67,8 @@ func (l *ByPushHistoryLogic) ByPushHistory(in *bxsubscribe.SubscribeInfosReq) (*
 		IsEnt:            in.IsEnt,
 		UserType:         in.UserType,
 		PositionType:     in.PositionType,
+		NotReturnCount:   in.NotReturnCount,
+		Item:             in.Item,
 	}
 	//主体处理(fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户)
 	if in.UserType == model.MemberFlag || in.UserType == model.SubVipFlag || in.UserType == model.SubFreeFlag {

jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

@@ -103,6 +103,8 @@ func (l *GetSubListLogic) GetSubList(in *bxsubscribe.SubscribeInfosReq) (*bxsubs
 		UserType:         in.UserType,
 		PositionType:     in.PositionType,
 		IsPayUser:        isPayUser,
+		NotReturnCount:   in.NotReturnCount,
+		Item:             in.Item,
 	}
 	//主体处理(fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户)
 	if in.UserType == model.MemberFlag || in.UserType == model.SubVipFlag || in.UserType == model.SubFreeFlag {

jyBXSubscribe/rpc/model/push.go

@@ -106,6 +106,8 @@ type SubPushQueryParam struct {
 	UserType         string
 	PositionType     int64
 	IsPayUser        bool // 是否是付费用户
+	NotReturnCount   int64
+	Item             string
 }
 
 // 关键词参数
@@ -124,7 +126,7 @@ type KeyParam struct {
 }
 
 func (spqp *SubPushQueryParam) IsEmpty() bool {
-	return (spqp.SelectTime == "" || spqp.SelectTime == "all") && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == ""
+	return (spqp.SelectTime == "" || spqp.SelectTime == "all") && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Item == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == ""
 }
 
 type subscribePush struct {
@@ -307,7 +309,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 	start := (spqp.PageNum - 1) * spqp.PageSize
 	end := start + spqp.PageSize
 	//时间是今天，没有别的过滤条件--首先读取当前推送缓存数据 其次查询数据库
-	if nowFormat == date.FormatDateByInt64(&starttime, date.Date_Short_Layout) && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == "" && len(spqp.SelectInfoIds) == 0 {
+	if nowFormat == date.FormatDateByInt64(&starttime, date.Date_Short_Layout) && spqp.Area == "" && spqp.City == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Item == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == "" && len(spqp.SelectInfoIds) == 0 {
 		subPush := &SubPush{}
 		var err error
 		if spqp.IsEnt == false {
@@ -323,7 +325,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 				Datas: list,
 				Count: countSearch,
 			}
-			if spqp.IsEnt == false {
+			if spqp.IsEnt == false && spqp.NotReturnCount == 0 {
 				s.PutTodayCache(spqp.UserId, spqp.UserType, subPush)
 			}
 		}
@@ -361,7 +363,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 				Datas: list,
 				Count: countSearch,
 			}
-			if spqp.IsEnt == false {
+			if spqp.IsEnt == false && spqp.NotReturnCount == 0 {
 				s.PutAllCache(spqp.UserId, spqp.UserType, allCache)
 			}
 		}
@@ -386,12 +388,13 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
 }
 
 func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, endtime int64, size int, isLimit bool) (result []*bxsubscribe.SubscribeInfo, count int64) {
+	start := time.Now().Unix()
 	querys := []string{}
-	userStr := " "
+	userStr := " 1=1  "
 	var (
 		countSql, findSql string
 	)
-	querys = append(querys, " 1=1 ")
+	querys = append(querys, " and   1=1 ")
 	if spqp.SelectInfoIds != nil && len(spqp.SelectInfoIds) > 0 {
 		countSql = fmt.Sprintf("select count(1) as count from %s a  where %s", aboutDbMsg[s.ModuleFlag].MysqlTable, fmt.Sprintf("a.id in ('%s')", strings.Join(spqp.SelectInfoIds, "','")))
 		logx.Info("countSql", countSql)
@@ -402,11 +405,11 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 		//公共查询条件
 		//时间
 		if starttime > 0 && endtime > 0 {
-			userStr += fmt.Sprintf(" and a.date>=%d and a.date<=%d", starttime, endtime)
+			querys = append(querys, fmt.Sprintf("  a.date>=%d and a.date<=%d", starttime, endtime))
 		} else if starttime > 0 && endtime == 0 {
-			userStr += fmt.Sprintf(" and a.date>=%d", starttime)
+			querys = append(querys, fmt.Sprintf(" a.date>=%d", starttime))
 		} else if starttime == 0 && endtime > 0 {
-			userStr += fmt.Sprintf(" and a.date<=%d", endtime)
+			querys = append(querys, fmt.Sprintf(" a.date<=%d", endtime))
 		}
 		if spqp.Area != "" || spqp.City != "" {
 			var sqlAreaCity = ""
@@ -492,17 +495,30 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 			}
 		}
 		//关键词
-		if spqp.Key != "" {
-			find_in_set := []string{}
-			for _, v := range strings.Split(spqp.Key, ",") {
-				find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
+		find_in_set := []string{}
+		if spqp.IsEnt {
+			if spqp.Key != "" {
+				for _, v := range strings.Split(spqp.Key, ",") {
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
+				}
 			}
-			if len(find_in_set) == 1 {
-				querys = append(querys, find_in_set[0])
-			} else if len(find_in_set) > 1 {
-				querys = append(querys, fmt.Sprintf("(%s)", strings.Join(find_in_set, " or ")))
+			if spqp.Item != "" {
+				for _, v := range strings.Split(spqp.Item, ",") {
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchitems,'+',','),' ',','))", v))
+				}
+			}
+		} else {
+			if spqp.Key != "" {
+				for _, v := range strings.Split(spqp.Key, ",") {
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
+				}
 			}
 		}
+		if len(find_in_set) == 1 {
+			querys = append(querys, find_in_set[0])
+		} else if len(find_in_set) > 1 {
+			querys = append(querys, fmt.Sprintf("(%s)", strings.Join(find_in_set, " or ")))
+		}
 		//价格- 预算和中标金额
 		if spqp.Price != "" && strings.Contains(spqp.Price, "-") {
 			minPriceStr, maxPriceStr := strings.Split(spqp.Price, "-")[0], strings.Split(spqp.Price, "-")[1]
@@ -527,25 +543,26 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 		// 是否已读
 		if spqp.IsRead != "" {
 			if spqp.IsRead == "0" {
-				userStr += " and a.isvisit IS NULL"
+				querys = append(querys, " a.isvisit IS NULL")
 			} else if spqp.IsRead == "1" {
-				userStr += " and a.isvisit=1"
+				querys = append(querys, "  a.isvisit=1")
 			}
 		}
 		// 信息来源
 		if spqp.Source == "1" || spqp.Source == "2" || spqp.Source == "3" {
-			userStr += " and a.source=" + spqp.Source
+			querys = append(querys, "  a.source="+spqp.Source)
 		}
 		if spqp.IsEnt {
 			var staffs []string
-			userStr += fmt.Sprintf(" and  a.entid='%s' ", spqp.EntId)
+			querys = append(querys, fmt.Sprintf("   a.entid='%s' ", spqp.EntId))
 			//判断是企业管理员还是部门管理员 部门管理员获取所有子部门
 			userEnt := EntInfo(common.IntAll(spqp.EntId), common.IntAll(spqp.EntUserId))
 			if !(userEnt.Role_admin_system || userEnt.Role_admin_department) {
 				result = []*bxsubscribe.SubscribeInfo{}
 				return
 			}
-			if userEnt.Role_admin_department { //部门管理员 获取所有部门和子部门员工
+			if userEnt.Role_admin_department { //
+				// 部门管理员 获取所有部门和子部门员工
 				users := GetDisUsers(common.IntAll(spqp.EntId), userEnt.Dept.Id)
 				if users != nil && len(*users) > 0 {
 					for _, v := range *users {
@@ -567,53 +584,37 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 			} else if len(spqp.Staffs) > 0 {
 				staffs = spqp.Staffs
 			}
-			//老板商机管理需要查询全部来源
-			isNew := true
-			//商机管理判断
-			newCount := IC.MainMysql.CountBySql("select  count(id) from  entniche_info where  id =? and  isNew != 1 and  status=1", spqp.EntId)
-			if newCount > 0 {
-				isNew = false
-			}
 			// 无查询分配人员、是否已读
 			if spqp.IsRead == "" && len(staffs) == 0 {
 				//查询数量（需要去重）
-				countSql = fmt.Sprintf("select count(1) from %s a    where %s %s %s", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, common.If(isNew, " and a.source = 2 ", ""))
+				countSql = fmt.Sprintf("select count(1) from %s a  where %s  %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "))
 				//列表查询
-				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count from %s a  where  %s %s %s order by a.date desc,a.id desc",
-					aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, common.If(isNew, " and a.source = 2 ", ""))
+				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count, IF(a.source is NULL,1,a.source) as  source  from %s a  where  %s %s order by a.date desc,a.id desc",
+					aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "))
 			} else {
 				//查询分配人员或是否已读
-				staffQuery := " 1=1 "
-				if len(staffs) > 0 {
+				staffQuery := " and   1=1 "
+				if len(spqp.Staffs) > 0 {
 					staffQuery += fmt.Sprintf(" and  a.userid in ('%s')  ", strings.Join(staffs, "','"))
+				} else if len(staffs) > 0 {
+					staffQuery += fmt.Sprintf(" and  a.userid in (0,'%s')  ", strings.Join(staffs, "','"))
 				}
-				if spqp.IsRead != "" {
-					if spqp.IsRead == "0" {
-						staffQuery += " and a.isvisit IS NULL"
-					} else if spqp.IsRead == "1" {
-						staffQuery += " and a.isvisit=1"
-					}
-				}
-				//countSql = fmt.Sprintf("select count(1) from %s a  where %s %s and ((%s) or EXISTS (SELECT 1 from %s c  WHERE c.source=3 %s and %s and a.id=c.pid and (%s))) ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, staffQuery, aboutDbMsg[s.ModuleFlag].MysqlTable, strings.ReplaceAll(userStr, "a.", "c."), strings.Join(querys, " and "), strings.ReplaceAll(staffQuery, "a.", "c."))
-				countSql = fmt.Sprintf("select count(1) from %s a  where %s %s and %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, staffQuery)
-
+				countSql = fmt.Sprintf("select count(1) from %s a  where %s %s %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "), staffQuery)
 				//列表查询
-				//findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count from %s a where %s %s %s and ((%s) or EXISTS (SELECT 1 from %s c  WHERE c.source=3 %s and %s and a.id=c.pid and (%s))) order by a.date desc,a.id desc ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, common.If(isNew, " and a.source = 2 ", ""), staffQuery, aboutDbMsg[s.ModuleFlag].MysqlTable, strings.ReplaceAll(userStr, "a.", "c."), strings.Join(querys, " and "), strings.ReplaceAll(staffQuery, "a.", "c."))
-				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count,IF(a.source is NULL,1,a.source) as  source from %s a  where %s %s and %s order by a.date desc,a.id desc ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, staffQuery)
-
+				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count,IF(a.source is NULL,1,a.source) as  source from %s a  where %s %s  %s order by a.date desc,a.id desc ", aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "), staffQuery)
 			}
 		} else {
 			// 是否已读
 			if spqp.IsRead != "" {
 				if spqp.IsRead == "0" {
-					userStr += " and a.isvisit IS NULL"
+					querys = append(querys, " a.isvisit IS NULL")
 				} else if spqp.IsRead == "1" {
-					userStr += " and a.isvisit=1"
+					querys = append(querys, " a.isvisit=1")
 				}
 			}
 			// 信息来源
 			if spqp.Source == "1" || spqp.Source == "2" || spqp.Source == "3" {
-				userStr += " and a.source=" + spqp.Source
+				querys = append(querys, " a.source="+spqp.Source)
 			}
 			if spqp.PositionType == 1 {
 				//企业主体是企业的个人查询
@@ -636,7 +637,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 				}
 			}
 			//查询数量
-			countSql = fmt.Sprintf("select count(1) as count from %s  a  where 1=1 %s and %s", aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "))
+			countSql = fmt.Sprintf("select count(1) as count from %s  a  where  %s   %s", aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "))
 			//列表查询语句
 			findSql = "select a.id,a.date,a.infoid,a.isvisit,a.matchkeys,a.type,a.attachment_count"
 			if s.ModuleFlag == EntnicheFlag {
@@ -645,18 +646,23 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 			if s.ModuleFlag != MemberFlag && s.ModuleFlag != EntnicheFlag {
 				findSql += ",a.isvip"
 			}
-			findSql = fmt.Sprintf("%s from %s  a  where  %s %s "+
-				" order by a.date desc,a.id desc", findSql, aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr)
+			findSql = fmt.Sprintf("%s from %s  a  where  %s   %s "+
+				" order by a.date desc,a.id desc", findSql, aboutDbMsg[s.ModuleFlag].MysqlTable, userStr, strings.Join(querys, " and "))
 		}
 		//查询总数
 		logx.Info("countSql", countSql)
-		count = spqp.BaseServiceMysql.CountBySql(countSql)
+		if spqp.NotReturnCount == 0 {
+			count = spqp.BaseServiceMysql.CountBySql(countSql)
+		}
+		log.Println("数据总数查询", count)
 	}
 	if isLimit {
 		findSql += fmt.Sprintf(" limit %d,%d", (spqp.PageNum-1)*size, size)
 	}
 	logx.Info(spqp.NewUserId, "subscribePush query sql：", findSql)
 	list := spqp.BaseServiceMysql.SelectBySql(findSql)
+	end1 := time.Now().Unix()
+	log.Println("mysql查询用时:", end1-start)
 	if list != nil && len(*list) > 0 {
 		pushCas := s.GetJyPushs(*list)
 		if !spqp.Export {
@@ -667,6 +673,9 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 	} else {
 		result = []*bxsubscribe.SubscribeInfo{}
 	}
+	end2 := time.Now().Unix()
+	log.Println("处理数据用时:", end2-end1)
+	log.Println("总用时用时:", end2-start)
 	return
 }
 
@@ -693,7 +702,6 @@ func (s *subscribePush) GetInfoByIds(Mgo_bidding mongodb.MongodbSim, bidding, bi
 		}
 		m[v.InfoId] = true
 		ids = append(ids, v.InfoId)
-
 	}
 	infos := map[string]map[string]interface{}{}
 	//redis
@@ -803,6 +811,7 @@ func (s *subscribePush) GetJyPushs(datas []map[string]interface{}) (pushCas []*P
 
 // 查看全部列表缓存
 func (s *subscribePush) PutAllCache(userId, userType string, datas *SubPush) {
+	log.Println("pushcache_2_a", s.allKey(userId, userType), datas, oneDay)
 	redis.Put("pushcache_2_a", s.allKey(userId, userType), datas, oneDay)
 }
 

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

@@ -1,7 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
+<<<<<<< HEAD
 // 	protoc-gen-go v1.28.0
 // 	protoc        v3.19.4
+=======
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.15.1
+>>>>>>> master
 // source: bxsubscribe.proto
 
 package bxsubscribe
@@ -26,6 +31,7 @@ type SubscribeInfosReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+<<<<<<< HEAD
 	PageNum      int64  `protobuf:"varint,1,opt,name=pageNum,proto3" json:"pageNum,omitempty"`
 	PageSize     int64  `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize,omitempty"`
 	SelectTime   string `protobuf:"bytes,3,opt,name=selectTime,proto3" json:"selectTime,omitempty"`
@@ -53,6 +59,34 @@ type SubscribeInfosReq struct {
 	AccountId    string `protobuf:"bytes,25,opt,name=accountId,proto3" json:"accountId,omitempty"`   //账户id
 	PositionId   string `protobuf:"bytes,26,opt,name=positionId,proto3" json:"positionId,omitempty"` //职位id
 	MgoUserId    string `protobuf:"bytes,27,opt,name=mgoUserId,proto3" json:"mgoUserId,omitempty"`   //原userId
+=======
+	PageNum        int64  `protobuf:"varint,1,opt,name=pageNum,proto3" json:"pageNum,omitempty"`
+	PageSize       int64  `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize,omitempty"`
+	SelectTime     string `protobuf:"bytes,3,opt,name=selectTime,proto3" json:"selectTime,omitempty"`
+	Area           string `protobuf:"bytes,4,opt,name=area,proto3" json:"area,omitempty"`
+	City           string `protobuf:"bytes,5,opt,name=city,proto3" json:"city,omitempty"`
+	Industry       string `protobuf:"bytes,6,opt,name=industry,proto3" json:"industry,omitempty"`
+	BuyerClass     string `protobuf:"bytes,7,opt,name=buyerClass,proto3" json:"buyerClass,omitempty"`
+	KeyWords       string `protobuf:"bytes,8,opt,name=keyWords,proto3" json:"keyWords,omitempty"`
+	Subtype        string `protobuf:"bytes,9,opt,name=subtype,proto3" json:"subtype,omitempty"`
+	UserType       string `protobuf:"bytes,10,opt,name=userType,proto3" json:"userType,omitempty"` //fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户；
+	UserId         string `protobuf:"bytes,11,opt,name=userId,proto3" json:"userId,omitempty"`
+	EntId          string `protobuf:"bytes,12,opt,name=entId,proto3" json:"entId,omitempty"`
+	AppId          string `protobuf:"bytes,13,opt,name=appId,proto3" json:"appId,omitempty"`
+	Price          string `protobuf:"bytes,14,opt,name=price,proto3" json:"price,omitempty"`
+	FileExists     string `protobuf:"bytes,15,opt,name=fileExists,proto3" json:"fileExists,omitempty"`
+	IsRead         string `protobuf:"bytes,16,opt,name=isRead,proto3" json:"isRead,omitempty"` //是否已读
+	Staffs         string `protobuf:"bytes,17,opt,name=staffs,proto3" json:"staffs,omitempty"` //分发人员
+	Source         string `protobuf:"bytes,18,opt,name=source,proto3" json:"source,omitempty"` //信息来源
+	EntUserId      string `protobuf:"bytes,19,opt,name=entUserId,proto3" json:"entUserId,omitempty"`
+	DeptId         string `protobuf:"bytes,20,opt,name=deptId,proto3" json:"deptId,omitempty"`
+	NewUserId      int64  `protobuf:"varint,21,opt,name=newUserId,proto3" json:"newUserId,omitempty"`
+	IsEnt          bool   `protobuf:"varint,22,opt,name=IsEnt,proto3" json:"IsEnt,omitempty"`
+	SelectIds      string `protobuf:"bytes,23,opt,name=SelectIds,proto3" json:"SelectIds,omitempty"`
+	PositionType   int64  `protobuf:"varint,24,opt,name=positionType,proto3" json:"positionType,omitempty"`
+	NotReturnCount int64  `protobuf:"varint,25,opt,name=notReturnCount,proto3" json:"notReturnCount,omitempty"`
+	Item           string `protobuf:"bytes,26,opt,name=item,proto3" json:"item,omitempty"`
+>>>>>>> master
 }
 
 func (x *SubscribeInfosReq) Reset() {
@@ -255,6 +289,7 @@ func (x *SubscribeInfosReq) GetPositionType() int64 {
 	return 0
 }
 
+<<<<<<< HEAD
 func (x *SubscribeInfosReq) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
@@ -272,6 +307,18 @@ func (x *SubscribeInfosReq) GetPositionId() string {
 func (x *SubscribeInfosReq) GetMgoUserId() string {
 	if x != nil {
 		return x.MgoUserId
+=======
+func (x *SubscribeInfosReq) GetNotReturnCount() int64 {
+	if x != nil {
+		return x.NotReturnCount
+	}
+	return 0
+}
+
+func (x *SubscribeInfosReq) GetItem() string {
+	if x != nil {
+		return x.Item
+>>>>>>> master
 	}
 	return ""
 }
@@ -3872,7 +3919,11 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x0a, 0x11, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
 	0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+<<<<<<< HEAD
 	0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe9,
+=======
+	0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc9,
+>>>>>>> master
 	0x05, 0x0a, 0x11, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f,
 	0x73, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x70, 0x61, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a,
@@ -3913,6 +3964,7 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x49, 0x64, 0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x09, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x49, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x6f,
 	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x03,
+<<<<<<< HEAD
 	0x52, 0x0c, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c,
 	0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
@@ -3920,6 +3972,13 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
 	0x6d, 0x67, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x09, 0x6d, 0x67, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x78, 0x0a, 0x12, 0x53, 0x75,
+=======
+	0x52, 0x0c, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26,
+	0x0a, 0x0e, 0x6e, 0x6f, 0x74, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x19, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x6e, 0x6f, 0x74, 0x52, 0x65, 0x74, 0x75, 0x72,
+	0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x1a,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x78, 0x0a, 0x12, 0x53, 0x75,
+>>>>>>> master
 	0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70,
 	0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65,

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

@@ -1,7 +1,11 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
+<<<<<<< HEAD
 // - protoc             v3.19.4
+=======
+// - protoc             v3.15.1
+>>>>>>> master
 // source: bxsubscribe.proto
 
 package bxsubscribe