Răsfoiți Sursa

feat:升级

wangchuanjin 1 an în urmă
părinte
comite
7189078e9e
5 a modificat fișierele cu 84 adăugiri și 55 ștergeri
  1. 2 2
      openPower/config.json
  2. 1 1
      openPower/go.mod
  3. 2 2
      openPower/go.sum
  4. BIN
      openPower/openPower
  5. 79 50
      openPower/openPower.go

+ 2 - 2
openPower/config.json

@@ -1,5 +1,5 @@
 {
-	"etcdAddr": ["127.0.0.1:2379"],
+	"etcdAddr": ["192.168.3.206:2379"],
 	"mongodb": {
 	    "main": {
 	      "address": "192.168.3.206:27080",
@@ -17,5 +17,5 @@
 	      	"maxIdleConns": 2
 	    }
   	},
-	"products": [14,15,16,17,18,19,20,22,23,24,27,28,25,26,29,30,31]
+	"products": [14,15,16,17,18,19,20,22,23,24,27,28,25,26,29,30,31,32]
 }

+ 1 - 1
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.1.1-0.20231207054140-89a687b9c0bb
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.1-0.20240108101737-86c53d74548d
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 )
 

+ 2 - 2
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.1.1-0.20231207054140-89a687b9c0bb h1:tB1iSI7JPrDzlI1N+HSM39rl+k691EeSXwCl/8QrExs=
-bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.1-0.20231207054140-89a687b9c0bb/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.1-0.20240108101737-86c53d74548d h1:2ecAX6Ufrgpye/9dQBYtrffjqYUN0sLSC/A4c+UHR0k=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.1-0.20240108101737-86c53d74548d/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=

BIN
openPower/openPower


+ 79 - 50
openPower/openPower.go

@@ -34,10 +34,7 @@ var (
 	all          map[string]string
 	powerType    string
 	middleground *Middleground
-	allEntity    = map[string]Entity{
-		"yxy": &Yxy{},
-	}
-	c *Config
+	c            *Config
 )
 
 type Config struct {
@@ -88,8 +85,9 @@ func main() {
 		filterSpec[v] = true
 	}
 	MysqlMain.Init()
-	allEntity := map[int64]*Common{}
-	allT := ""
+	allEntity := map[int64]Entity{}
+	allEntity[-1] = &Yxy{}
+	allT := "-1:医械通"
 	for _, v := range *MysqlMain.SelectBySql(`select a.id,c.code,c.name,a.goods_code,a.name as spec_name from base_service.base_goods_spec a
 		inner join base_service.base_goods_spec_power b on (a.id=b.spec_id)
 		inner join base_service.base_function c on (b.function_code=c.code) order by a.id`) {
@@ -114,7 +112,7 @@ func main() {
 				All:         map[string]string{name: code},
 			}
 		} else {
-			allEntity[id].All[name] = code
+			(allEntity[id].(*Common)).All[name] = code
 		}
 	}
 	phone := flag.String("p", "", "手机号")
@@ -211,54 +209,85 @@ func main() {
 				if *isCheck == 1 && !entity.beforeOpen(phone, identity) {
 					return
 				}
-				for _, v := range all {
-					wed, err := resClient.WaitEmpowerDetail(context.Background(), &pb.WaitEmpowerDetailReq{
-						Appid:        "10000",
-						EntId:        identity.EntId,
-						FunctionCode: v,
+				endTime := ""
+				if *dayCount > 0 {
+					now := time.Now()
+					end_time := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local)
+					end_time = end_time.AddDate(0, 0, *dayCount-1)
+					endTime = date.FormatDate(&end_time, date.Date_Full_Layout)
+				}
+				isEmpower := false
+				if identity.EntId > 0 {
+					resp, err := resClient.WaitEmpowerDetailBySpecId(context.Background(), &pb.WaitEmpowerDetailBySpecIdReq{
+						Appid:  "10000",
+						EntId:  identity.EntId,
+						SpecId: goodsSpecId,
 					})
 					if err != nil {
 						log.Println(msg, powerType, "开通失败!", err)
-					} else if wed.Id == 0 {
-						endTime := ""
-						if *dayCount > 0 {
-							now := time.Now()
-							end_time := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, time.Local)
-							end_time = end_time.AddDate(0, 0, *dayCount-1)
-							endTime = date.FormatDate(&end_time, date.Date_Full_Layout)
-						}
-						powerReq := &pb.PowerReq{
-							Appid:       appid,
-							GoodsCode:   goodsCode,
-							GoodsSpecId: goodsSpecId,
-							BuyNum:      0,
-							Type:        1,
-							EndTime:     endTime,
-						}
-						if *powerWay == 2 {
-							powerReq.EntAccountId = identity.EntAccountId
-							powerReq.EntId = identity.EntId
-						} else {
-							powerReq.AccountId = identity.AccountId
-						}
-						r, err := resClient.PowerHandle(context.Background(), powerReq)
-						if err != nil {
-							log.Println(msg, powerType, "开通失败!", err)
-						} else if r.Status == 1 {
-							if *isCheck == 1 {
-								entity.afterOpen(phone, identity)
-							}
-							log.Println(msg, powerType, "已开通!")
-						} else {
-							log.Println(msg, powerType, "开通失败!")
+					} else if len(resp.WaitEmpowerDetails) > 0 {
+						if *powerWay < 2 {
+							isEmpower = true
+						} else if *powerWay == 2 {
+							log.Fatalln(msg, powerType, "权益已存在!")
 						}
 					}
-					resClient.Empower(context.Background(), &pb.EmpowerReq{
-						Appid:        "10000",
-						FunctionCode: v,
-						EntId:        identity.EntId,
-						EntUserId:    []int64{identity.EntUserId},
-					})
+					// for _, v := range all {
+					// 	resp, err := resClient.WaitEmpowerDetail(context.Background(), &pb.WaitEmpowerDetailReq{
+					// 		Appid:        "10000",
+					// 		EntId:        identity.EntId,
+					// 		FunctionCode: v,
+					// 	})
+					// 	log.Println(v, resp.Id)
+					// 	if err != nil {
+					// 		log.Println(msg, powerType, "开通失败!", err)
+					// 	} else if resp.Id > 0 {
+					// 		if *powerWay < 2 {
+					// 			isEmpower = true
+					// 		} else if *powerWay == 2 {
+					// 			log.Fatalln(msg, powerType, "权益已存在!")
+					// 		}
+					// 	}
+					// 	break
+					// }
+				}
+				var r *pb.Resp
+				var err error
+				if isEmpower {
+					for _, v := range all {
+						r, err = resClient.Empower(context.Background(), &pb.EmpowerReq{
+							Appid:        "10000",
+							FunctionCode: v,
+							EntId:        identity.EntId,
+							EntUserId:    []int64{identity.EntUserId},
+						})
+					}
+				} else {
+					powerReq := &pb.PowerReq{
+						Appid:       appid,
+						GoodsCode:   goodsCode,
+						GoodsSpecId: goodsSpecId,
+						BuyNum:      1,
+						Type:        1,
+						EndTime:     endTime,
+					}
+					if *powerWay == 2 {
+						powerReq.EntAccountId = identity.EntAccountId
+						powerReq.EntId = identity.EntId
+					} else {
+						powerReq.AccountId = identity.AccountId
+					}
+					r, err = resClient.PowerHandle(context.Background(), powerReq)
+				}
+				if err != nil {
+					log.Println(msg, powerType, "开通失败!", err)
+				} else if r.Status == 1 {
+					if *isCheck == 1 {
+						entity.afterOpen(phone, identity)
+					}
+					log.Println(msg, powerType, "已开通!")
+				} else {
+					log.Println(msg, powerType, "开通失败!")
 				}
 			} else if *m == 3 {
 				powerReq := &pb.PowerReq{