fix:pdf权益分配&回收

service/service.go

@@ -487,12 +487,12 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 					cycle := common.IntAll((*filterMap)["cycle"])         //购买时长
 					cycleType := common.IntAll((*filterMap)["cycleType"]) //时间类型
 					cycleFmt := common.If(cycleType == 0, 12, 366).(int)
-					if tm := cycle / cycleFmt; tm > 0 {
-						number = number * tm
-					}
+					number = number * (cycle / cycleFmt)
 					frequency = number
-					if err := AddPdfPack(common.InterfaceToStr(userId), resourceType, common.Int64All(orderData["ent_id"])); err != nil {
-						log.Println("AddPdfPack err ", err)
+					if number > 0 {
+						if err := AddPdfPack(common.InterfaceToStr(userId), resourceType, common.Int64All(orderData["ent_id"])); err != nil {
+							log.Println("AddPdfPack err ", err)
+						}
 					}
 				}
 				if frequency == 0 {
@@ -624,12 +624,12 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 func AddPdfPack(userId, resourceType string, entId int64) error {
 	log.Println("AddPdfPack==", userId, resourceType, entId)
 	ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
-	ResourceCenterRpc.EntAccountGiven(ctx, &resourcesCenterclient.EntOperateReq{
+	_, err := ResourceCenterRpc.EntAccountGiven(ctx, &resourcesCenterclient.EntOperateReq{
 		OperateAccountId: userId,
 		CompanyId:        entId,
 		ResourceType:     resourceType,
 	})
-	return nil
+	return err
 }
 
 // DelPdfPack 增加pdf下载包权限
@@ -637,12 +637,12 @@ func AddPdfPack(userId, resourceType string, entId int64) error {
 func DelPdfPack(userId, resourceType string, entId int64) error {
 	log.Println("DelPdfPack===", userId, resourceType, entId)
 	ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
-	ResourceCenterRpc.EntAccountRecovery(ctx, &resourcesCenterclient.EntOperateReq{
+	_, err := ResourceCenterRpc.EntAccountRecovery(ctx, &resourcesCenterclient.EntOperateReq{
 		OperateAccountId: userId,
 		CompanyId:        entId,
 		ResourceType:     resourceType,
 	})
-	return nil
+	return err
 }
 
 func EmpowerUserIds(ids []int64) *entmanageapplication.EmpowerUserIds {