Merge branch 'feature/v1.1.64' of https://jygit.jydev.jianyu360.cn/BaseService/jyMicroservices into feature/v1.1.64

jyBXSubscribe/rpc/etc/bxsubscribe.yaml

@@ -2,7 +2,7 @@ Name: bxsubscribe.rpc
 ListenOn: 0.0.0.0:8010
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+    - 127.0.0.1:2379
   Key: bxsubscribe.rpc
 Timeout: 100000
 Webrpcport: 8013
@@ -23,4 +23,4 @@ Nsq: 192.168.3.240:4260
 NsqTopic: jy_event
 Registedate: 1705556502
 GuideRegistedate: 1735034400  #该时间之前注册的付费用户不用进订阅向导
-SubListTip: 为您预加载最近15天发布的%s商机
+SubListTip: -为您预加载最近15天发布的%s商机-

jyBXSubscribe/rpc/internal/logic/getsubsomeinfologic.go

@@ -142,6 +142,14 @@ func (l *GetSubSomeInfoLogic) GetSubSomeInfo(in *bxsubscribe.SomeInfoReq) (*bxsu
 				switch in.UserType {
 				case SubFreeFlag:
 					resp.Data.Subsetinfo.Key = freegetsubKey(subinfo)
+					// 判断有没有省份订阅包
+					o_buyset_p, o_buyset_p_b := subinfo["o_buyset_p"].(map[string]interface{})
+					if o_buyset_p != nil && o_buyset_p_b {
+						resp.Data.Subsetinfo.Areacount += common.Int64All(o_buyset_p["areacount"])
+						if o_area_p, ok := subinfo["o_area_p"].(map[string]interface{}); ok {
+							resp.Data.Subsetinfo.Area = common.MapToJson(o_area_p)
+						}
+					}
 				case SubVipFlag:
 					o_buyset := common.ObjToMap(subinfo["o_buyset"])
 					if o_buyset != nil {

jyBXSubscribe/rpc/internal/logic/savetsguidelogic.go

@@ -44,7 +44,7 @@ func (l *SaveTSGuideLogic) SaveTSGuide(in *bxsubscribe.SaveTSGuideReq) (*bxsubsc
 	entId, _ := strconv.ParseInt(in.EntId, 10, 64)
 	// 校验是否已经完成过订阅向导
 	//  查询订阅信息中的关键词和向导查询
-	data := IC.Compatible.Select(in.UserId, `{"i_ts_guide":1,"l_registedate":1,"o_member_jy":1}`)
+	data := IC.Compatible.Select(in.UserId, `{"i_ts_guide":1,"l_registedate":1,"o_member_jy":1,"o_jy":1}`)
 	if data != nil && len(*data) > 0 {
 		registedate := common.Int64All((*data)["l_registedate"])
 		if (in.UserType != SubFreeFlag && registedate < IC.C.GuideRegistedate) || common.Int64All((*data)["i_ts_guide"]) == tsGuideFinished {
@@ -67,6 +67,14 @@ func (l *SaveTSGuideLogic) SaveTSGuide(in *bxsubscribe.SaveTSGuideReq) (*bxsubsc
 		countLimit = 10
 		field = "o_jy.%s"
 		areaCountLimit = 1 // 免费用户
+		// 省份订阅包
+		o_jy, o_jyb := (*data)["o_jy"].(map[string]interface{})
+		if o_jy != nil && o_jyb {
+			o_buyset_p, o_buyset_p_b := o_jy["o_buyset_p"].(map[string]interface{})
+			if o_buyset_p != nil && o_buyset_p_b {
+				areaCountLimit += common.IntAll(o_buyset_p["areacount"])
+			}
+		}
 	case SubVipFlag:
 		if user.Vip.Status <= 0 {
 			return nil, errors.New("身份异常")