feat:企业免费用户初始化订阅数据

jyBXSubscribe/rpc/model/push.go

@@ -1341,7 +1341,9 @@ func (s *subscribePush) getUserInfo(spqp *SubPushQueryParam) (vc *ViewCondition)
 		entInfo, deptId := (&ms.MatchJob{}).Start(entId, entUserId)
 		if entInfo != nil && len(entInfo) > 0 {
 			spqp.DeptId = strconv.Itoa(deptId)
-			isPayBool = true
+			if common.IntAll(entInfo["i_type"]) != 2 {
+				isPayBool = true
+			}
 			tmpInfo.Items, _ = entInfo["a_items"].([]interface{})
 			tmpInfo.BuyerClass, _ = entInfo["a_buyerclass"].([]interface{})
 			tmpInfo.SubType, _ = entInfo["a_infotype"].([]interface{})

jyBXSubscribe/rpc/model/service/matchjob.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	util "app.yhyue.com/moapp/jybase/common"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXSubscribe/rpc/init"
 	"log"
+
+	util "app.yhyue.com/moapp/jybase/common"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 //用户基本信息
@@ -46,6 +47,7 @@ func (m *MatchJob) LoadSubSet(entId int) map[*UserInfo]bool {
 		"i_deptid":   1,
 		"i_userid":   1,
 		"o_entniche": 1,
+		"i_type":     1,
 	}).Iter()
 	log.Println("it", it)
 	for _temp := make(map[string]interface{}); it.Next(&_temp); {
@@ -71,6 +73,7 @@ func (m *MatchJob) LoadSubSet(entId int) map[*UserInfo]bool {
 				logx.Info("订阅设置为空，过滤掉", entName, entId, deptName, deptId, userId)
 				return
 			}
+			subSet["i_type"] = temp["i_type"]
 			//
 			if deptId > 0 { //部门订阅
 				if EntDepts[deptId].Subdis == 0 {