feat:升级

openPower/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230523020646-528a068dac39
 	app.yhyue.com/moapp/jypkg v0.0.0-20230218064127-1de4f4f3e6a3
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 )
 

openPower/go.sum

@@ -7,8 +7,8 @@ bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230209051900-1e7
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230209051900-1e7dcb8f83b7/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
 bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 h1:14Yxzutsej7LQe3jnN61wuRX9qjAZ4FtdWMA27ewQ3w=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

openPower/openPower.go

@@ -85,7 +85,7 @@ func main() {
 	dayCount := flag.Int("c", 0, "自定义设置需要开通权益的天数，包含今天")
 	entName := flag.String("n", "", "企业名称")
 	isCheck := flag.Int("b", 1, "是否前置校验和后置处理")
-	allIdentity := flag.Int("a", 0, "是否全部身份；0：否 1：是")
+	openWay := flag.Int("a", 0, "开通权益方式；0：只开一个身份 1：开全部身份 2：只开到企业上")
 	flag.Parse()
 	if *phone == "" {
 		log.Fatalln("-p 参数无效")
@@ -145,12 +145,18 @@ func main() {
 	for _, v := range *ur {
 		id := Int64All(v["base_user_id"])
 		for _, identity := range middleground.UserCenter.IdentityList(id) {
-			if *allIdentity == 0 {
+			if *openWay == 0 {
 				if *entName == "" && identity.PositionType == 1 {
 					continue
 				} else if *entName != "" && (identity.PositionType == 0 || *entName != identity.Name) {
 					continue
 				}
+			} else if *openWay == 2 {
+				if *entName == "" {
+					continue
+				} else if identity.PositionType == 0 || *entName != identity.Name {
+					continue
+				}
 			}
 			msg := "身份信息：" + fmt.Sprintf("%+v", identity) + " 手机号：" + *phone
 			var c = resource.NewResource(middleground.ResourceCenter.NewClient())
@@ -194,16 +200,21 @@ func main() {
 					end_time = end_time.AddDate(0, 0, *dayCount-1)
 					endTime = date.FormatDate(&end_time, date.Date_Full_Layout)
 				}
-				r, err := c.PowerHandle(context.Background(), &pb.PowerReq{
+				powerReq := &pb.PowerReq{
 					Appid:       appid,
 					GoodsCode:   goodsCode,
 					GoodsSpecId: goodsSpecId,
 					EntId:       0,
-					AccountId:   identity.AccountId,
 					BuyNum:      1,
 					Type:        1,
 					EndTime:     endTime,
-				})
+				}
+				if *openWay == 2 {
+					powerReq.EntAccountId = identity.EntAccountId
+				} else {
+					powerReq.AccountId = identity.AccountId
+				}
+				r, err := c.PowerHandle(context.Background(), powerReq)
 				if err != nil {
 					log.Println(msg, powerType, "开通失败！", err)
 				} else if r.Status == 1 {

public/entity/base_power.go

@@ -2,7 +2,6 @@ package entity
 
 import (
 	"database/sql"
-	"log"
 	"strings"
 	"time"
 
@@ -82,12 +81,13 @@ func (b *base_power) OpenPower(goods_spec_id int64, appid, goods_code string, ac
 					continue
 				} else if v.Base_function.Haspower == 0 {
 					continue
-				} else if v.Power_type == 2 && (ent_account_id == 0 && ent_id == 0) {
+				} else if v.Power_type == 1 && account_id == 0 {
+					continue
+				} else if v.Power_type == 2 && (ent_account_id == 0 || ent_id == 0) {
 					continue
 				}
 				power_values = append(power_values, appid, v.Id, v.Function_code, v.Power_type)
 				if v.Power_type == 2 {
-					log.Println("----------", ent_account_id)
 					power_values = append(power_values, ent_account_id)
 				} else {
 					power_values = append(power_values, account_id)