xg

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -48,7 +48,7 @@ message subscribeData{
   int64 count = 1;
   bool hasNextPage = 2;
   repeated subscribeInfo list = 3;
-  bool isRecommend = 4;
+  string isRecommend = 4;
 }
 
 message subscribeInfo {

jyBXSubscribe/rpc/internal/logic/bidreclistlogic.go

@@ -28,9 +28,9 @@ func NewBidRecListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *BidRec
 func (l *BidRecListLogic) BidRecList(in *bxsubscribe.BidRecListReq) (*bxsubscribe.SubscribeInfosResp, error) {
 	var list []*bxsubscribe.SubscribeInfo
 	hasNextPage, total, list := model.NewSubscribePush("").SubRecList(common.ObjToString(common.If(in.PositionType == 0, in.UserId, in.EntUserId)), []model.ViewKeyWord{})
-	if len(list) == 0 && in.SPath == "1" { // 订阅更多
-		hasNextPage, total, list = model.NewSubscribePush("").GetRecListByEs()
-	}
+	//if len(list) == 0 && in.SPath == "1" { // 订阅更多
+	//	hasNextPage, total, list = model.NewSubscribePush("").GetRecListByEs()
+	//}
 	return &bxsubscribe.SubscribeInfosResp{
 		ErrCode: 0,
 		ErrMsg:  "",

jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

@@ -115,16 +115,16 @@ func (l *GetSubListLogic) GetSubList(in *bxsubscribe.SubscribeInfosReq) (*bxsubs
 	 *免费用户默认推送50条
 	 *大会员、新版商机管理、超级订阅用户 默认推送1000条记录
 	 */
-	isRecommend := false
+	isRecommend := "1" //1：老数据 2：历史（clickhouse） 3：新数据
 	if in.PageNum == 1 && spqp.IsEmpty() && (len(list) == 0 || (in.PositionType == 0 && spqp.SubPushInactive == -1)) && in.IsEnt == false {
 		hasNextPage, total, list = model.NewSubscribePush(in.UserType).DefaultDatas(spqp, bsp, in.UserType)
 		if in.Stag == "home" {
 			if len(list) == 0 {
-				isRecommend = true
+				isRecommend = "2"
 				hasNextPage, total, list = model.NewSubscribePush(in.UserType).SubRecList(common.ObjToString(common.If(in.PositionType == 0, spqp.UserId, spqp.EntUserId)), bsp.Keyword)
 			}
 			if len(list) == 0 {
-				isRecommend = true
+				isRecommend = "3"
 				hasNextPage, total, list = model.NewSubscribePush(in.UserType).GetRecListByEs()
 			}
 		}

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

@@ -388,7 +388,7 @@ type SubscribeData struct {
 	Count       int64            `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`
 	HasNextPage bool             `protobuf:"varint,2,opt,name=hasNextPage,proto3" json:"hasNextPage,omitempty"`
 	List        []*SubscribeInfo `protobuf:"bytes,3,rep,name=list,proto3" json:"list,omitempty"`
-	IsRecommend bool             `protobuf:"varint,4,opt,name=isRecommend,proto3" json:"isRecommend,omitempty"`
+	IsRecommend string           `protobuf:"bytes,4,opt,name=isRecommend,proto3" json:"isRecommend,omitempty"`
 }
 
 func (x *SubscribeData) Reset() {
@@ -444,11 +444,11 @@ func (x *SubscribeData) GetList() []*SubscribeInfo {
 	return nil
 }
 
-func (x *SubscribeData) GetIsRecommend() bool {
+func (x *SubscribeData) GetIsRecommend() string {
 	if x != nil {
 		return x.IsRecommend
 	}
-	return false
+	return ""
 }
 
 type SubscribeInfo struct {
@@ -4227,7 +4227,7 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
 	0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b,
 	0x69, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0b, 0x69, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x22, 0xa1,
+	0x09, 0x52, 0x0b, 0x69, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x22, 0xa1,
 	0x08, 0x0a, 0x0d, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f,
 	0x12, 0x0f, 0x0a, 0x03, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49,
 	0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,