Merge branch 'feature/v1.1.10' of ssh://192.168.3.207:10022/BaseService/jyMicroservices into feature/v1.1.10

jyBXSubscribe/rpc/internal/logic/bypushhistorylogic.go

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

jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

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

jyBXSubscribe/rpc/internal/logic/setreadlogic.go

@@ -2,7 +2,6 @@ package logic
 
 import (
 	"context"
-	IC "jyBXSubscribe/rpc/init"
 	"jyBXSubscribe/rpc/model"
 
 	"jyBXSubscribe/rpc/internal/svc"
@@ -31,7 +30,7 @@ func (l *SetReadLogic) SetRead(in *bxsubscribe.SetReadReq) (*bxsubscribe.StatusR
 	resp := &bxsubscribe.StatusResp{}
 	//主体处理(fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户)
 	userType := in.UserType
-	infoCount := int64(0)
+	/*infoCount := int64(0)
 	if in.UserType == model.MemberFlag {
 		infoCount = IC.MainMysql.CountBySql("select  count(id) from  entniche_wait_empower where  ent_id=? and  end_time>NOW() and product_type like '%大会员%' ", in.EntId)
 	} else if in.UserType == model.SubVipFlag {
@@ -40,8 +39,12 @@ func (l *SetReadLogic) SetRead(in *bxsubscribe.SetReadReq) (*bxsubscribe.StatusR
 
 	if infoCount > 0 {
 		in.UserType = model.EntnicheFlag
+	}*/
+	if in.UserType == model.MemberFlag || in.UserType == model.SubVipFlag || in.UserType == model.SubFreeFlag {
+		if in.PositionType == 1 {
+			in.UserType = model.EntnicheFlag
+		}
 	}
-
 	model.NewSubscribePush(in.UserType).SetRead(in.NewUserId, in.Vsid, in.UserId, in.EntUserId, in.EntId, in.IsEnt, userType)
 	return resp, nil
 }