Răsfoiți Sursa

Merge branch 'feature/v1.0.22_ws' of moapp/jypkg into feature/v1.0.22

wangshan 1 an în urmă
părinte
comite
05fbe9478b
3 a modificat fișierele cu 9 adăugiri și 5 ștergeri
  1. 6 2
      common/src/qfw/util/jy/ad.go
  2. 1 1
      go.mod
  3. 2 2
      go.sum

+ 6 - 2
common/src/qfw/util/jy/ad.go

@@ -22,13 +22,13 @@ const (
 	UserAttributeLimitMV       = "lmv" // 用户身份 大会员且超级订阅
 	UserAttributeLimitV        = "lv"  // 用户身份 超级订阅(非大会员的超级订阅)
 	UserAttributeNotMV         = "nmv" // 用户身份 非超级订阅非大会员的用户(可能是商机管理用户、免费用户)
+	UserAttributeDocsMember    = "dm"  //用户身份 文库会员
 	UB                         = true  //
 	OrderAttributeVipBuy       = "vb"  // 订单分类 vip购买
 	OrderAttributeVipRenew     = "vr"  // 订单分类 vip续费
 	OrderAttributeVipUpgrade   = "vu"  // 订单分类 vip升级
 	OrderAttributeBigMemberBuy = "bb"  // 订单分类 大会员购买
 	OrderAttributeNoHave       = "oan" //未查到对应订单信息
-
 )
 
 // 获取当天剩余时间
@@ -102,7 +102,7 @@ func (a *AdFunc) GetAdInfos() (adInfoMap map[string][]AdInfo) {
 
 // Handle 广告位信息处理
 func (a *AdFunc) Handle() (adInfos []AdInfo) {
-	var ads []AdInfo
+	var ads = []AdInfo{}
 	err := json.Unmarshal(*a.Ads, &ads)
 	if err == nil && len(ads) > 0 {
 		now := time.Now()
@@ -214,6 +214,10 @@ func (a *AdFunc) GetUserAttribute() (attributesMap map[string]bool) {
 		return
 	}
 	ui := a.UserInfo
+	//文库会员
+	if ui.Data.Docs.Status > 0 {
+		attributesMap[UserAttributeDocsMember] = UB
+	}
 	if ui.Status <= 0 && ui.VipStatus <= 0 {
 		// 非超级订阅非大会员
 		attributesMap[UserAttributeNotMV] = UB

+ 1 - 1
go.mod

@@ -9,7 +9,7 @@ require (
 	app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20231222060155-36e225b61353
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16
 	github.com/gogf/gf/v2 v2.7.0

+ 2 - 2
go.sum

@@ -27,8 +27,8 @@ bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:BMLd/5wb3BIEGhnEgF9y1sJN9P5/Dw9kYsoiE9V8I9g=
 bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2 h1:Qi8C7gZeR7+kjOtSl9ilR5HwbjCe8GO1RuotFb4+kFA=
 bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2/go.mod h1:v8y7FCbkKEIRP4Ie9ZM8NtoRP+Fk4O3C1hnexNusYIQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20231222060155-36e225b61353 h1:QnkyOQ0tHVaPmtYx0xcCKzwBrUEasWH+nQ3qVnD0XnI=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20231222060155-36e225b61353/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b h1:6f/if8nVoR89n7RbgFEniiUqt4QpqJNQX2kS2JJHDEM=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
 bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743/go.mod h1:1SQIPPL5Ya5BzQdByFKtTkXrXTWBv+PDqWIhNknLnZw=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936dd53/go.mod h1:E5lcDI3k4FESLxiAetCfWQTq8qfpy9cv0yN1oKoEO34=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41751/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=