fix:pdf权益分配&回收

go.mod

@@ -3,7 +3,7 @@ module bp.jydev.jianyu360.cn/BaseService/entManageApplication
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20240713070259-aa4926276dd6
+	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20240731073206-ab5392f6a62f
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230221025500-c75817e849ea

go.sum

@@ -1,6 +1,6 @@
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
-app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20240713070259-aa4926276dd6 h1:cahuMA8z4AQe19VD0PfQjQhTRKdo2Caaxnatt5rtlhE=
-app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20240713070259-aa4926276dd6/go.mod h1:yFuws02BGRNABRnsDdmFMphzrX4A6zmBDrup2/ZPwbM=
+app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20240731073206-ab5392f6a62f h1:WQ5QNjoGGqTTyc/J8okl2orF9D3Uc2dsfC1dofiFR4E=
+app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20240731073206-ab5392f6a62f/go.mod h1:yFuws02BGRNABRnsDdmFMphzrX4A6zmBDrup2/ZPwbM=
 app.yhyue.com/moapp/jybase v0.0.0-20220415064050-37ce64b3e2d4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=

service/service.go

@@ -250,7 +250,7 @@ func addPower(waitEmpowerId int64, identity *usercenter.Identity) {
 				})
 			} else if productType == "大会员" {
 				log.Println("开通大会员", identity.PositionId)
-				set, setEntUser := memberSetMap(identity.PositionId, *orderData)
+				set, setEntUser := memberSetMap(identity.PositionId, waitEmpowerId, *orderData)
 				setRule(identity, set, setEntUser)
 			}
 		}
@@ -398,7 +398,7 @@ func vipSetMap(orderData map[string]interface{}) (set map[string]interface{}, se
 	return
 }
 
-func memberSetMap(userId int64, orderData map[string]interface{}) (set map[string]interface{}, setEntUser map[string]interface{}) {
+func memberSetMap(userId, waitEmpowerId int64, orderData map[string]interface{}) (set map[string]interface{}, setEntUser map[string]interface{}) {
 	set, setEntUser = map[string]interface{}{}, map[string]interface{}{}
 	filterMap := common.ObjToMap(orderData["filter"])
 	level := common.IntAll((*filterMap)["level"])
@@ -470,7 +470,7 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 					number = number * (cycle / cycleFmt)
 					frequency = number
 					if number > 0 {
-						if err := AddPdfPack(common.InterfaceToStr(userId), resourceType, common.Int64All(orderData["ent_id"])); err != nil {
+						if err := AddPdfPack(common.InterfaceToStr(userId), resourceType, common.Int64All(orderData["ent_id"]), waitEmpowerId); err != nil {
 							log.Println("AddPdfPack err ", err)
 						}
 					}
@@ -544,7 +544,7 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 				}
 				if resourceType != "" {
 					frequency = common.IntAll((*serverData)["s_count_year"])
-					if err := AddPdfPack(common.InterfaceToStr(userId), resourceType, common.Int64All(orderData["ent_id"])); err != nil {
+					if err := AddPdfPack(common.InterfaceToStr(userId), resourceType, common.Int64All(orderData["ent_id"]), waitEmpowerId); err != nil {
 						log.Println("AddPdfPack err ", err)
 					}
 				}
@@ -601,11 +601,12 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 
 // AddPdfPack 增加pdf下载包权限
 // resourceType        "企业中标分析报告下载包","业主采购分析报告下载包","市场分析定制报告下载包"
-func AddPdfPack(userId, resourceType string, entId int64) error {
+func AddPdfPack(userId, resourceType string, entId, waitEmpowerId int64) error {
 	log.Println("AddPdfPack==", userId, resourceType, entId)
 	ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
 	_, err := ResourceCenterRpc.EntAccountGiven(ctx, &resourcesCenterclient.EntOperateReq{
 		OperateAccountId: userId,
+		EmpowerId:        waitEmpowerId,
 		CompanyId:        entId,
 		ResourceType:     resourceType,
 	})