Merge branch 'master' of https://git.i2edu.net/i2/i2-bill-api

etc/i2bill-api.yaml

@@ -10,7 +10,7 @@ Transform:
   Etcd:
     Hosts:
       - 47.103.219.158:30019
-    Key: transform.rpc
+    Key: icole.rpc
 Weixin:
   Appid: wxb8a763ab9e81d0cb
   Secret: 95dc14b89d32fe91709bba8916f30f74

internal/svc/cache_erp.go

@@ -8,12 +8,20 @@ import (
 
 func (svc *ServiceContext) GetErpOrganSchool(ctx context.Context) ([]*transform.OrganSchool, error) {
 	var schools = new([]*transform.OrganSchool)
+	//res, err := svc.Transformer.GetErpSchool(ctx, &transform.Empty{})
+	//if err != nil {
+	//	return nil, err
+	//}
+	//err = svc.RdCli.SetWithExpire(cacheErpSchool, res.School, 1*time.Minute)
+	//if err != nil {
+	//	return nil, err
+	//}
 	if err := svc.RdCli.GetCache(cacheErpSchool, schools); err != nil {
 		res, err := svc.Transformer.GetErpSchool(ctx, &transform.Empty{})
 		if err != nil {
 			return nil, err
 		}
-		err = svc.RdCli.SetWithExpire(cacheErpSchool, res.School, time.Hour)
+		err = svc.RdCli.SetWithExpire(cacheErpSchool, res.School, 1*time.Minute)
 		if err != nil {
 			return nil, err
 		}
@@ -29,7 +37,7 @@ func (svc *ServiceContext) GetErpOrganSchoolTree(ctx context.Context) ([]*transf
 		if err != nil {
 			return nil, err
 		}
-		err = svc.RdCli.SetWithExpire(cacheErpSchoolTree, res.Nodes, time.Hour)
+		err = svc.RdCli.SetWithExpire(cacheErpSchoolTree, res.Nodes, 1*time.Minute)
 		if err != nil {
 			return nil, err
 		}
@@ -45,7 +53,7 @@ func (svc *ServiceContext) GetErpNetworkDetailTree(ctx context.Context) ([]*tran
 		if err != nil {
 			return nil, err
 		}
-		err = svc.RdCli.SetWithExpire(cacheErpNetworkDetailTree, res.Nodes, time.Hour)
+		err = svc.RdCli.SetWithExpire(cacheErpNetworkDetailTree, res.Nodes, 1*time.Minute)
 		if err != nil {
 			return nil, err
 		}
@@ -61,7 +69,7 @@ func (svc *ServiceContext) GetErpActivity(ctx context.Context) ([]*transform.Act
 		if err != nil {
 			return nil, err
 		}
-		err = svc.RdCli.SetWithExpire(cacheErpSchool, res.Active, time.Hour)
+		err = svc.RdCli.SetWithExpire(cacheErpActivity, res.Active, 1*time.Minute)
 		if err != nil {
 			return nil, err
 		}
@@ -77,7 +85,7 @@ func (svc *ServiceContext) GetErpCity(ctx context.Context) ([]*transform.TreeNod
 		if err != nil {
 			return nil, err
 		}
-		err = svc.RdCli.SetWithExpire(cacheErpCityTree, res.Nodes, time.Hour)
+		err = svc.RdCli.SetWithExpire(cacheErpCityTree, res.Nodes, 1*time.Minute)
 		if err != nil {
 			return nil, err
 		}

model/i2bill_user_model.go

@@ -225,6 +225,7 @@ func GetI2bilUserInfo(userId int64, engine *xorm.Engine) (*UserXorm, error) {
 }
 
 func GetAcquirePerm(userId int64, rpcClient transformclient.Transform, engine *xorm.Engine, ctx context.Context) (*transform.GetErpRoleRes, error) {
+	var res = new(transform.GetErpRoleRes)
 	partUser, err := GetPartTimeXormByUserId(userId, engine)
 	fmt.Println("----------", err)
 
@@ -232,7 +233,10 @@ func GetAcquirePerm(userId int64, rpcClient transformclient.Transform, engine *x
 		return nil, err
 	}
 	if partUser.Id != 0 && partUser.MkId != "" {
-		return GetErpUser("", partUser.MkId, rpcClient, ctx)
+		res, err = GetErpUser("", partUser.MkId, rpcClient, ctx)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	user, err := GetI2bilUserInfo(userId, engine)
@@ -240,7 +244,14 @@ func GetAcquirePerm(userId int64, rpcClient transformclient.Transform, engine *x
 		return nil, err
 	}
 
-	return GetErpUser(user.Mobile, "", rpcClient, ctx)
+	resMobile, err := GetErpUser(user.Mobile, "", rpcClient, ctx)
+	if err != nil {
+		return nil, err
+	}
+	if resMobile.UserId != "" {
+		res = resMobile
+	}
+	return res, nil
 }
 
 type AcquirePermInfo struct {