Bläddra i källkod

fix:mod修改

duxin 1 år sedan
förälder
incheckning
df0fc08a1f
3 ändrade filer med 11 tillägg och 10 borttagningar
  1. 1 1
      src/go.mod
  2. 2 3
      src/go.sum
  3. 8 6
      src/jfw/front/hybg.go

+ 1 - 1
src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20240104022202-158734833402
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.14.7
+	app.yhyue.com/moapp/jypkg v1.14.8
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0

+ 2 - 3
src/go.sum

@@ -1,4 +1,3 @@
-
 app.yhyue.com/moapp/MessageCenter v0.0.0-20230918064638-5cd2498053ae/go.mod h1:SJsuvb720yzCajIfwtVNPKT6y4OiIqD3cOXJgOLZ52Q=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+jPzpnsDe/OvcshDUUtOTZPYGSJ8=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
@@ -21,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240104022202-158734833402/go.mod h1:fjaD11Z3
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.14.7 h1:X8/6LO59ZpzS/FhxKR3m9avO6zbq+KV1lwhowqGhQ7k=
-app.yhyue.com/moapp/jypkg v1.14.7/go.mod h1:uGSHEjlIVCDFeud5hD7bY5Z1Csrvh+c3vr4Mg50qCW0=
+app.yhyue.com/moapp/jypkg v1.14.8 h1:jWQUPuTYrTFJnr7rDOUJInHTKVXbtNvDjNipfJ6O3kQ=
+app.yhyue.com/moapp/jypkg v1.14.8/go.mod h1:ZdrY5aTfeb2HrgLGKyNIETiHS28DNclpGGBSUpdOrx8=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

+ 8 - 6
src/jfw/front/hybg.go

@@ -129,17 +129,19 @@ func (l *DeskAnalysisReport) DeskReport() {
 		if len(areas) == 0 {
 			userData := jy.GetBigVipUserBaseMsg(l.Session(), *config.Middleground)
 			oArea := &map[string]interface{}{}
-			if userData.Data.Member.Status > 0 {
+			if userData.Status > 0 {
 				types = "m"
-			} else if userData.Data.Vip.Status > 0 {
+			} else if userData.VipStatus > 0 {
 				types = "v"
 			} else if userData.EntnicheStatus == 1 {
 				types = "s"
 			}
 			vipJy := jy.GetSubScribeInfo(l.Session(), mongodb, types, "10000")
-			oArea = qutil.ObjToMap((*vipJy)["o_area"])
-			for key := range *oArea {
-				areas = append(areas, key)
+			if vipJy != nil {
+				oArea = qutil.ObjToMap((*vipJy)["o_area"])
+				for key := range *oArea {
+					areas = append(areas, key)
+				}
 			}
 		}
 
@@ -155,7 +157,7 @@ func (l *DeskAnalysisReport) DeskReport() {
 		}
 		log.Printf("用户userId:%s,mgoid:%s,types:%s,sql:%s\n", userId, mgoUserId, types, strSql)
 		var dataArrMap []map[string]interface{}
-		reportRes, _ := g.DB().Query(gctx.New(), fmt.Sprintf(`SELECT * FROM analysis_report %s ORDER BY show_time DESC,classify desc LIMIT 10
+		reportRes, _ := g.DB().Query(gctx.New(), fmt.Sprintf(`SELECT * FROM analysis_report %s ORDER BY show_time DESC,classify desc,id desc  LIMIT 10
 `, strSql))
 		if !reportRes.IsEmpty() {
 			for _, row := range reportRes.List() {