Selaa lähdekoodia

fix:pdf权益回收判断是否存在可使用权益

duxin 1 kuukausi sitten
vanhempi
commit
2065187838
3 muutettua tiedostoa jossa 25 lisäystä ja 9 poistoa
  1. 1 0
      entbase/src/config.yaml
  2. 13 0
      entbase/src/config/config.go
  3. 11 9
      entbase/src/service/person/person.go

+ 1 - 0
entbase/src/config.yaml

@@ -3,3 +3,4 @@ etcd:
   - 192.168.3.206:2379
 userCenterKey: "usercenter.rpc" #用户中台rpc
 powerCheckCenterKey: "powercheck.rpc" #权益校验中台
+resourceCenterKey: "resourcescenter.rpc"

+ 13 - 0
entbase/src/config/config.go

@@ -8,6 +8,9 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/zeromicro/go-zero/core/discov"
+	"github.com/zeromicro/go-zero/zrpc"
+	"log"
 )
 
 type config struct {
@@ -101,5 +104,15 @@ func init() {
 	g.Cfg().GetAdapter().(*gcfg.AdapterFile).SetFileName("config.yaml")
 	var ctx = gctx.New()
 	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings()).RegUserCenter(g.Cfg().MustGet(ctx, "userCenterKey").String()).RegPowerCheckCenter(g.Cfg().MustGet(ctx, "powerCheckCenterKey").String())
+	rc, err := zrpc.NewClient(zrpc.RpcClientConf{
+		Etcd: discov.EtcdConf{
+			Hosts: g.Cfg().MustGet(ctx, "etcd.hosts").Strings(),
+			Key:   g.Cfg().MustGet(ctx, "resourceCenterKey").String(),
+		},
+	})
+	if err != nil {
+		log.Fatalln(err)
+	}
+	ResourceCenterRpc = resourcesCenterclient.NewResourcesCenter(rc)
 
 }

+ 11 - 9
entbase/src/service/person/person.go

@@ -570,18 +570,20 @@ func DelPdfPack(userId string, entId int64) {
 		AccountId:    userId,
 		ResourceName: "pdf下载包",
 	})
-	if err != nil || res == nil {
+	if err != nil {
 		log.Println("FindAccountBalance err", err.Error(), res)
 		return
 	}
-	for _, datum := range res.Data {
-		if datum.Number > 0 {
-			_, err = ResourceCenterRpc.EntAccountRecovery(ctx, &resourcesCenterclient.EntOperateReq{
-				OperateAccountId: userId,
-				CompanyId:        entId,
-				ResourceType:     datum.ResourceType,
-			})
-			log.Println("EntAccountRecovery err", err.Error())
+	if res != nil {
+		for _, datum := range res.Data {
+			if datum.Number > 0 {
+				_, err = ResourceCenterRpc.EntAccountRecovery(ctx, &resourcesCenterclient.EntOperateReq{
+					OperateAccountId: userId,
+					CompanyId:        entId,
+					ResourceType:     datum.ResourceType,
+				})
+				log.Println("EntAccountRecovery err", err.Error())
+			}
 		}
 	}
 }