wangdisen
/
tyj_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

广告，公告，登录登出GM

master
linquan 2 months ago
parent
b5beb82f0d
commit
5e60d2ef16
13 changed files with 225 additions and 162 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      api/v1/game/advertisement.go
  2. 20
      api/v1/game/basicinfo.go
  3. 15
      api/v1/game/manage.go
  4. 15
      api/v1/game/pub.go
  5. 5
      internal/controller/baseinfo_role.go
  6. 96
      internal/controller/game_pub.go
  7. 103
      internal/controller/game_server.go
  8. 3
      internal/router/router.go
  9. 9
      internal/serviceGame/advertisement.go
  10. 6
      internal/serviceGame/game_role.go
  11. 39
      internal/serviceGame/internal/advertisement.go
  12. 47
      internal/serviceGame/internal/basicinfo.go
  13. 10
      internal/serviceGame/notice.go

19
api/v1/game/advertisement.go
Unescape View File

@ -48,7 +48,7 @@ type DeepADRes struct {
}
type ATHAReq struct {
g.Meta `path:"/attributionHA" tags:"ad" method:"get" summary:"广告投放"`
g.Meta `path:"/attributionHA" tags:"ad" method:"get" summary:"广告归因"`
Platform string `p:"platform"`
Idfa string `p:"idfa"`
Idfv string `p:"idfv"`
@ -85,11 +85,12 @@ type ATHARes struct {
}
type CSHAReq struct {
g.Meta `path:"/conversionHA" tags:"ad" method:"get" summary:"广告投放"`
EventType string `p:"event_type"`
Platform string `p:"platform"`
Id string `p:"id"`
Idfa string `p:"idfa"`
g.Meta `path:"/conversionHA" tags:"ad" method:"get" summary:"广告转化"`
EventType string `p:"event_type"`
Platform string `p:"platform"`
Id string `p:"id"`
Idfa string `p:"idfa"`
Properties string `p:"properties"`
}
type CSHARes struct {
@ -104,6 +105,7 @@ type AdvertiseHAReq struct {
Id string `p:"id"`
Idfa string `p:"idfa"`
PackageName string `p:"package_name"`
Properties string `p:"properties"`
}
type AdvertiseHARes struct {
@ -118,7 +120,6 @@ type AdvertiseHA1Req struct {
TIMESTAMP string `p:"TIMESTAMP"`
Callback string `p:"callback"`
Androidid string `p:"androidid"`
Oaid string `p:"oaid"`
}
type AdvertiseHA1Res struct {
@ -133,7 +134,6 @@ type AdvertiseHA2Req struct {
TIMESTAMP string `p:"TIMESTAMP"`
Callback string `p:"callback"`
Androidid string `p:"androidid"`
Oaid string `p:"oaid"`
}
type AdvertiseHA2Res struct {
@ -148,7 +148,6 @@ type AdvertiseHA3Req struct {
TIMESTAMP string `p:"TIMESTAMP"`
Callback string `p:"callback"`
Androidid string `p:"androidid"`
Oaid string `p:"oaid"`
}
type AdvertiseHA3Res struct {
@ -163,7 +162,6 @@ type AdvertiseHA4Req struct {
TIMESTAMP string `p:"TIMESTAMP"`
Callback string `p:"callback"`
Androidid string `p:"androidid"`
Oaid string `p:"oaid"`
}
type AdvertiseHA4Res struct {
@ -178,7 +176,6 @@ type AdvertiseHA5Req struct {
TIMESTAMP string `p:"TIMESTAMP"`
Callback string `p:"callback"`
Androidid string `p:"androidid"`
Oaid string `p:"oaid"`
}
type AdvertiseHA5Res struct {

20
api/v1/game/basicinfo.go
Unescape View File

@ -95,15 +95,14 @@ type GetLoginOutReq struct {
Uid string `p:"id"`
Account string `p:"account"`
State int32 `p:"state"`
PageNum int `p:"pageNum"`
PageSize int `p:"pageSize"`
ServerId int `p:"serverId"`
common.PageReq
}
type GetLoginOutRes struct {
g.Meta `mime:"application/json"`
Logs []entity.LoginLogoutInfo `json:"logs"`
Total int `json:"total"`
common.ListRes
}
type GetLoginOutLogReq struct {
@ -112,15 +111,14 @@ type GetLoginOutLogReq struct {
Id string `p:"id"`
Account string `p:"account"`
State int32 `p:"state"`
PageNum int `p:"pageNum"`
PageSize int `p:"pageSize"`
ServerId int `p:"serverId" `
common.PageReq
}
type GetLoginOutLogRes struct {
g.Meta `mime:"application/json"`
Logs []entity.LoginOutLog `json:"logs"`
Total int `json:"total"`
common.ListRes
}
type GetItemLogReq struct {
@ -129,15 +127,14 @@ type GetItemLogReq struct {
Id string `p:"id"`
Account string `p:"account"`
ItemId int `p:"ItemId"`
PageNum int `p:"pageNum"`
PageSize int `p:"pageSize"`
ServerId int `p:"serverId" `
common.PageReq
}
type GetItemLogRes struct {
g.Meta `mime:"application/json"`
Logs []entity.ItemIncomeExpenseRecords `json:"logs"`
Total int `json:"total"`
common.ListRes
}
type GetShopItemLogReq struct {
@ -188,15 +185,14 @@ type GetRegisterReq struct {
g.Meta `path:"/register/get" tags:"留存记录" method:"get" summary:"获取注册记录"`
Uid string `p:"id"`
Account string `p:"account"`
PageNum int `p:"pageNum"`
PageSize int `p:"pageSize"`
ServerId int `p:"serverId" `
common.PageReq
}
type GetRegisterRes struct {
g.Meta `mime:"application/json"`
Logs []entity.GameRegister `json:"logs"`
Total int `json:"total"`
common.ListRes
}
type GetKeepAliveReq struct {

15
api/v1/game/manage.go
Unescape View File

@ -447,3 +447,18 @@ type GetOperLogRes struct {
List []entity.SysOperLog `json:"list"`
common.ListRes
}
type GetLoginOutGmReq struct {
g.Meta `path:"/loginOut/getGm" tags:"log接口" method:"get" summary:"操作日志"`
Uid string `p:"id"`
Account string `p:"account"`
State int32 `p:"state"`
ServerId int `p:"serverId"`
common.PageReq
}
type GetLoginOutGmRes struct {
g.Meta `mime:"application/json"`
Logs []entity.LoginLogoutInfoGm `json:"logs"`
common.ListRes
}

15
api/v1/game/pub.go
Unescape View File

@ -110,11 +110,6 @@ type LoginOutReq struct {
RechargeTotal int `p:"rechargeTotal"`
StoreSum int `p:"storeSum"`
StoneAmount int `p:"stoneAmount"`
Item7307 int `p:"item7307"`
Item7315 int `p:"item7315"`
Item7316 int `p:"item7316"`
Item7319 int `p:"item7319"`
Item7312 int `p:"item7312"`
}
type LoginOutRes struct {
@ -209,16 +204,6 @@ type AddOutCCDReq struct {
type AddOutCCDRes struct {
}
type GetAuditModeReq struct {
g.Meta `path:"/out/auditMode" tags:"外部接口" method:"get" summary:"审核模式"`
Channel string `p:"channel"`
}
type GetAuditModeRes struct {
g.Meta `mime:"application/json"`
AuditMode int64 `json:"auditMode"`
}
type SetOpenIdReq struct {
g.Meta `path:"/setOpenId" tags:"外部接口" method:"get" summary:"先行服白名单"`
Filename string `p:"filename"`

5
internal/controller/baseinfo_role.go
Unescape View File

@ -71,3 +71,8 @@ func (c *gameRoleController) GameUserDel(ctx context.Context, req *game.UserDelR
res, err = serviceGame.GameRole().GameUserDel(ctx, req)
return res, err
}
func (c *gameRoleController) GetLoginOutGm(ctx context.Context, req *game.GetLoginOutGmReq) (res *game.GetLoginOutGmRes, err error) {
res, err = serviceGame.GameRole().GetLoginOutGm(ctx, req)
return res, err
}

96
internal/controller/game_pub.go
Unescape View File

@ -105,62 +105,11 @@ func (c *pubController) GetWhiteList(ctx context.Context, req *game.WhiteListReq
return
}
func (c *pubController) LoginOut(ctx context.Context, req *game.LoginOutReq) (res *game.LoginOutRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.LoginOutRes)
res, err = serviceGame.GamePub().LoginOut(ctx, req)
})
return
}
func (c *pubController) GameRegister(ctx context.Context, req *game.RegisterReq) (res *game.RegisterRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.RegisterRes)
res, err = serviceGame.GameRole().GameRegister(ctx, req)
})
return
}
func (c *pubController) ItemIncomeExpenseRecords(ctx context.Context, req *game.ItemRecordReq) (res *game.ItemRecordRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.ItemRecordRes)
res, err = serviceGame.GamePub().ItemRecord(ctx, req)
})
return
}
func (c *pubController) ShopRecords(ctx context.Context, req *game.ShopRecordReq) (res *game.ShopRecordRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.ShopRecordRes)
res, err = serviceGame.GamePub().ShopRecords(ctx, req)
})
return
}
func (c *pubController) GetAuditMode(ctx context.Context, req *game.GetAuditModeReq) (res *game.GetAuditModeRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.GetAuditModeRes)
res, err = serviceGame.GamePub().GetAuditMode(ctx, req)
})
return
}
func (c *pubController) GameUnitChangeName(ctx context.Context, req *game.UnitChangeNameReq) (res *game.UnitChangeNameRes, err error) {
g.Log().Info(ctx, "GameUnitChangeName - json: ", gjson.MustEncodeString(req))
res, err = serviceGame.GameRole().GameUnitChangeName(ctx, req)
return
}
func (c *pubController) RechargeControl(ctx context.Context, req *game.RechargeControlReq) (res *game.RechargeControlRes, err error) {
res, err = serviceGame.GameOrder().GameRechargeControl(ctx, req)
return res, err
}
func (c *pubController) GetGenerateCode(ctx context.Context, req *game.GetGenerateCodeReq) (res *game.GetGenerateCodeRes, err error) {
res, err = serviceGame.GameCdKey().GetGenerateCode(ctx, req)
return
}
func (c *pubController) Advertise(ctx context.Context, req *game.ADReq) (res *game.ADRes, err error) {
res, err = serviceGame.Advertisement().Advertise(ctx, req)
return
@ -171,61 +120,16 @@ func (c *pubController) DeepAdvertise(ctx context.Context, req *game.DeepADReq)
return
}
func (c *pubController) SetOpenId(ctx context.Context, req *game.SetOpenIdReq) (res *game.SetOpenIdRes, err error) {
res, err = serviceGame.GamePub().SetOpenId(ctx, req)
return
}
func (c *pubController) GetOpenId(ctx context.Context, req *game.GetOpenIdReq) (res *game.GetOpenIdRes, err error) {
res, err = serviceGame.GamePub().GetOpenId(ctx, req)
return
}
func (c *pubController) AddClientBug(ctx context.Context, req *game.ClientBugAddReq) (res *game.ClientBugAddRes, err error) {
res, err = serviceGame.GameClientBug().Add(ctx, req)
return
}
func (c *pubController) AddGenerateCode(ctx context.Context, req *game.AddGenerateCodeReq) (res *game.AddGenerateCodeRes, err error) {
res, err = serviceGame.GameCdKey().AddGenerateCode(ctx, req)
return
}
func (c *pubController) SetGmToClient(ctx context.Context, req *game.SetGmToClientReq) (res *game.SetGmToClientRes, err error) {
res, err = serviceGame.GameManage().SetGmToClient(ctx, req)
return
}
func (c *pubController) GetServerConfig(ctx context.Context, req *game.GetServerConfigReq) (res *game.GetServerConfigRes, err error) {
res, err = serviceGame.GamePub().GetServerConfig(ctx, req)
return
}
func (c *pubController) CheckFirstRebate(ctx context.Context, req *game.CheckFirstRebateReq) (res *game.CheckFirstRebateRes, err error) {
res, err = serviceGame.GamePub().CheckFirstRebate(ctx, req)
return
}
func (c *pubController) CheckSecondRebate(ctx context.Context, req *game.CheckSecondRebateReq) (res *game.CheckSecondRebateRes, err error) {
res, err = serviceGame.GamePub().CheckSecondRebate(ctx, req)
return
}
func (c *pubController) CheckRechargeSign(ctx context.Context, req *game.CheckRechargeSignReq) (res *game.CheckRechargeSignRes, err error) {
res, err = serviceGame.GameOrder().CheckRechargeSign(ctx, req)
return
}
func (c *pubController) AddRechargeSign(ctx context.Context, req *game.AddRechargeSignReq) (res *game.AddRechargeSignRes, err error) {
res, err = serviceGame.GameOrder().AddRechargeSign(ctx, req)
return
}
func (c *pubController) GetTransactionId(ctx context.Context, req *game.GetTransactionIdReq) (res *game.GetTransactionIdRes, err error) {
res, err = serviceGame.GameOrder().GetTransactionId(ctx, req)
return
}
func (c *pubController) AttributionHugeAmount(ctx context.Context, req *game.ATHAReq) (res *game.ATHARes, err error) {
res, err = serviceGame.Advertisement().AttributionHugeAmount(ctx, req)
return

103
internal/controller/game_server.go
Unescape View File

@ -0,0 +1,103 @@
package controller
import (
"context"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g"
"tyj_admin/api/v1/game"
"tyj_admin/internal/serviceGame"
)
var GameServer = serverController{}
type serverController struct {
BaseController
}
func (c *serverController) LoginOut(ctx context.Context, req *game.LoginOutReq) (res *game.LoginOutRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.LoginOutRes)
res, err = serviceGame.GamePub().LoginOut(ctx, req)
})
return
}
func (c *serverController) GameRegister(ctx context.Context, req *game.RegisterReq) (res *game.RegisterRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.RegisterRes)
res, err = serviceGame.GameRole().GameRegister(ctx, req)
})
return
}
func (c *serverController) ItemIncomeExpenseRecords(ctx context.Context, req *game.ItemRecordReq) (res *game.ItemRecordRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.ItemRecordRes)
res, err = serviceGame.GamePub().ItemRecord(ctx, req)
})
return
}
func (c *serverController) ShopRecords(ctx context.Context, req *game.ShopRecordReq) (res *game.ShopRecordRes, err error) {
err = g.Try(ctx, func(ctx context.Context) {
res = new(game.ShopRecordRes)
res, err = serviceGame.GamePub().ShopRecords(ctx, req)
})
return
}
func (c *serverController) GameUnitChangeName(ctx context.Context, req *game.UnitChangeNameReq) (res *game.UnitChangeNameRes, err error) {
g.Log().Info(ctx, "GameUnitChangeName - json: ", gjson.MustEncodeString(req))
res, err = serviceGame.GameRole().GameUnitChangeName(ctx, req)
return
}
func (c *serverController) GetGenerateCode(ctx context.Context, req *game.GetGenerateCodeReq) (res *game.GetGenerateCodeRes, err error) {
res, err = serviceGame.GameCdKey().GetGenerateCode(ctx, req)
return
}
func (c *serverController) SetOpenId(ctx context.Context, req *game.SetOpenIdReq) (res *game.SetOpenIdRes, err error) {
res, err = serviceGame.GamePub().SetOpenId(ctx, req)
return
}
func (c *serverController) AddClientBug(ctx context.Context, req *game.ClientBugAddReq) (res *game.ClientBugAddRes, err error) {
res, err = serviceGame.GameClientBug().Add(ctx, req)
return
}
func (c *serverController) AddGenerateCode(ctx context.Context, req *game.AddGenerateCodeReq) (res *game.AddGenerateCodeRes, err error) {
res, err = serviceGame.GameCdKey().AddGenerateCode(ctx, req)
return
}
func (c *serverController) GetServerConfig(ctx context.Context, req *game.GetServerConfigReq) (res *game.GetServerConfigRes, err error) {
res, err = serviceGame.GamePub().GetServerConfig(ctx, req)
return
}
func (c *serverController) CheckFirstRebate(ctx context.Context, req *game.CheckFirstRebateReq) (res *game.CheckFirstRebateRes, err error) {
res, err = serviceGame.GamePub().CheckFirstRebate(ctx, req)
return
}
func (c *serverController) CheckSecondRebate(ctx context.Context, req *game.CheckSecondRebateReq) (res *game.CheckSecondRebateRes, err error) {
res, err = serviceGame.GamePub().CheckSecondRebate(ctx, req)
return
}
func (c *serverController) CheckRechargeSign(ctx context.Context, req *game.CheckRechargeSignReq) (res *game.CheckRechargeSignRes, err error) {
res, err = serviceGame.GameOrder().CheckRechargeSign(ctx, req)
return
}
func (c *serverController) AddRechargeSign(ctx context.Context, req *game.AddRechargeSignReq) (res *game.AddRechargeSignRes, err error) {
res, err = serviceGame.GameOrder().AddRechargeSign(ctx, req)
return
}
func (c *serverController) GetTransactionId(ctx context.Context, req *game.GetTransactionIdReq) (res *game.GetTransactionIdRes, err error) {
res, err = serviceGame.GameOrder().GetTransactionId(ctx, req)
return
}

3
internal/router/router.go
Unescape View File

@ -184,6 +184,7 @@ func GameBindFrontController(group *ghttp.RouterGroup) {
controller.GamePub,
controller.OutCCD,
controller.OutId,
controller.GameRebate)
controller.GameRebate,
controller.GameServer)
})
}

9
internal/serviceGame/advertisement.go
Unescape View File

@ -2,6 +2,8 @@ package serviceGame
import (
"context"
"errors"
"strconv"
"tyj_admin/api/v1/game"
"tyj_admin/internal/dao"
"tyj_admin/internal/model/do"
@ -57,6 +59,13 @@ func (g *advertisementImpl) ConversionHugeAmount(ctx context.Context, req *game.
}
func (g *advertisementImpl) AdvertiseHugeAmount1(ctx context.Context, androidId, idfa, os, callBack, timestamp string) (err error) {
osInt, err := strconv.Atoi(os)
if err != nil {
return
}
if osInt != 0 && osInt != 1 {
return errors.New("系统类型错误！")
}
_, err = dao.AdvertisementOceanegine.Ctx(ctx).Insert(do.AdvertisementOceanegine{
AdvAndroidId: androidId,
Idfa: idfa,

6
internal/serviceGame/game_role.go
Unescape View File

@ -24,6 +24,7 @@ type IGameRole interface {
GetItemLog(ctx context.Context, req *game.GetItemLogReq) (res *game.GetItemLogRes, err error)
GetRegister(ctx context.Context, req *game.GetRegisterReq) (res *game.GetRegisterRes, err error)
GameUserDel(ctx context.Context, req *game.UserDelReq) (res *game.UserDelRes, err error)
GetLoginOutGm(ctx context.Context, req *game.GetLoginOutGmReq) (res *game.GetLoginOutGmRes, err error)
}
type gameRoleImpl struct {
@ -179,3 +180,8 @@ func (s *gameRoleImpl) GameUserDel(ctx context.Context, req *game.UserDelReq) (r
res, err = internal.GameUserDel(ctx, req)
return res, err
}
func (s *gameRoleImpl) GetLoginOutGm(ctx context.Context, req *game.GetLoginOutGmReq) (res *game.GetLoginOutGmRes, err error) {
res, err = internal.GetLoginOutGm(ctx, req)
return
}

39
internal/serviceGame/internal/advertisement.go
Unescape View File

@ -3,12 +3,14 @@ package internal
import (
"context"
"encoding/json"
"errors"
"fmt"
"github.com/gogf/gf/v2/encoding/gcharset"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"log"
"strconv"
"strings"
"time"
"tyj_admin/api/v1/game"
@ -131,8 +133,8 @@ func AttributionHugeAmount(ctx context.Context, req *game.ATHAReq) (res *game.AT
}
data["idfv"] = req.Idfv
}
url := "https://analytics.oceanengine.com/sdk/app/attribution"
url := "https://analytics.oceanengine.com/sdk/app/attribution"
tmp, err := sendMsgHugeAmount(ctx, url, data)
if err != nil {
return
@ -153,7 +155,7 @@ func AttributionHugeAmount(ctx context.Context, req *game.ATHAReq) (res *game.AT
} else if req.Platform == "ios" {
advertiseData.Os = 1
}
_, _ = dao.AdvertisementOceanegine.Ctx(ctx).Insert(data)
_, _ = dao.AdvertisementOceanegine.Ctx(ctx).Insert(advertiseData)
} else {
return nil, gerror.New("获取失败")
}
@ -175,14 +177,18 @@ func ConversionHugeAmount(ctx context.Context, req *game.CSHAReq) (res *game.CSH
return
}
device["android_id"] = req.Id
} else if req.Platform == "ios" {
} else if req.Platform == "ios" && req.Idfa != "" {
_ = model.Where("idfa=?", req.Idfa).Scan(&adData)
if len(adData) == 0 {
log.Printf("ConversionHugeAmount: adData is nil %s", gjson.MustEncodeString(req))
return
}
device["idfv"] = req.Id
} else {
return nil, errors.New("")
}
// log.Printf("ConversionHugeAmount: adData： %s", gjson.MustEncodeString(adData))
ad := map[string]interface{}{
"callback": adData[0].CallbackParam,
}
@ -195,6 +201,20 @@ func ConversionHugeAmount(ctx context.Context, req *game.CSHAReq) (res *game.CSH
"context": ct,
"timestamp": time.Now().UnixMilli(),
}
var properties map[string]interface{}
if len(req.Properties) > 0 {
err = json.Unmarshal([]byte(req.Properties), &properties)
if err != nil {
log.Printf("ConversionHugeAmount: json.Unmarshal([]byte(req.Properties), &properties) err： %s", gjson.MustEncodeString(properties))
return
}
if properties["pay_amount"] != nil {
amount, _ := strconv.Atoi(fmt.Sprint(properties["pay_amount"]))
properties["pay_amount"] = amount * 100
}
data["properties"] = properties
}
// log.Printf("ConversionHugeAmount: json.Unmarshal([]byte(req.Properties), &properties)： %s", gjson.MustEncodeString(properties))
url := "https://analytics.oceanengine.com/api/v2/conversion"
_, _ = sendMsgHugeAmount(ctx, url, data)
return
@ -206,11 +226,15 @@ func AdvertiseHugeAmount(ctx context.Context, req *game.AdvertiseHAReq) (res *ga
if req.Platform == "android" {
return
}
if req.Platform == "iphoneplayer" {
req.Platform = "ios"
}
req2 := game.CSHAReq{
Platform: req.Platform,
Id: req.Id,
Idfa: req.Idfa,
EventType: req.EventType,
Platform: req.Platform,
Id: req.Id,
Idfa: req.Idfa,
EventType: req.EventType,
Properties: req.Properties,
}
req2.Id = req.Id
_, err = ConversionHugeAmount(ctx, &req2)
@ -218,6 +242,7 @@ func AdvertiseHugeAmount(ctx context.Context, req *game.AdvertiseHAReq) (res *ga
req1 := game.ATHAReq{
Platform: req.Platform,
PackageName: req.PackageName,
Idfa: req.Idfa,
}
if req.Platform == "android" {
req1.AndroidId = req.Id

47
internal/serviceGame/internal/basicinfo.go
Unescape View File

@ -889,14 +889,8 @@ func LoginOut(ctx context.Context, req *game.LoginOutReq) (res *game.LoginOutRes
RechargeTotal: req.RechargeTotal,
StoreSum: req.StoreSum,
StoneAmount: req.StoneAmount,
Item7307: req.Item7307,
Item7315: req.Item7315,
Item7316: req.Item7316,
Item7312: req.Item7312,
Item7319: req.Item7319,
})
if req.StoneAmount > 50000 || req.VouchersNum > 400 || req.Item7307 > 1000 || req.Item7315 > 50 ||
req.Item7316 > 1000 || req.Item7319 > 1000 || req.Item7312 > 50 || (req.RechargeTotal == 0 && req.VouchersNum > 10) {
if req.StoneAmount > 50000 || req.VouchersNum > 400 || (req.RechargeTotal == 0 && req.VouchersNum > 10) {
_, err = dao.LoginLogoutInfoGm.Ctx(ctx).Insert(&do.LoginLogoutInfoGm{
Uid: req.Uid,
State: req.State,
@ -913,11 +907,6 @@ func LoginOut(ctx context.Context, req *game.LoginOutReq) (res *game.LoginOutRes
RechargeTotal: req.RechargeTotal,
StoreSum: req.StoreSum,
StoneAmount: req.StoneAmount,
Item7307: req.Item7307,
Item7315: req.Item7315,
Item7316: req.Item7316,
Item7312: req.Item7312,
Item7319: req.Item7319,
})
}
}
@ -1148,3 +1137,37 @@ func GetOperLog(ctx context.Context, req *game.GetOperLogReq) (res *game.GetOper
})
return
}
func GetLoginOutGm(ctx context.Context, req *game.GetLoginOutGmReq) (res *game.GetLoginOutGmRes, err error) {
res = new(game.GetLoginOutGmRes)
g.Try(ctx, func(ctx context.Context) {
model := dao.LoginLogoutInfoGm.Ctx(ctx)
if req.Account != "" {
uid, _ := GetAccountUid2(ctx, req.Account, fmt.Sprint(req.ServerId))
if uid == 0 {
//g.Log().Debugf(ctx, "LoginOut -> "+fmt.Sprint(uid))
err = gerror.New("获取账号失败！")
return
}
model = model.Where("uid=? ", uid)
} else if req.Uid != "" {
uid, _ := strconv.ParseInt(req.Uid, 10, 64)
if uid == 0 {
//g.Log().Debugf(ctx, "LoginOut -> "+fmt.Sprint(uid))
err = gerror.New("获取账号失败！")
return
}
model = model.Where("uid=? ", uid)
}
if req.State != 0 {
model = model.Where("state=? ", req.State)
}
res.Total, err = model.Count()
err = model.Page(req.PageNum, req.PageSize).OrderDesc("c_date").Scan(&res.Logs)
if err != nil {
return
}
return
})
return
}

10
internal/serviceGame/notice.go
Unescape View File

@ -4,10 +4,8 @@ import (
"context"
"errors"
"fmt"
"github.com/gogf/gf/v2/encoding/gjson"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
"log"
"time"
"tyj_admin/api/v1/game"
"tyj_admin/internal/consts"
@ -43,7 +41,6 @@ func GameNotice() IGameNotice {
return &gameNoticeService
}
func (c *gameNoticeImpl) GetNotice(ctx context.Context, req *game.GetNoticeReq) (res *game.GetNoticeRes, err error) {
//internal.GetWhiteList(ctx)
res = new(game.GetNoticeRes)
g.Try(ctx, func(ctx context.Context) {
model := dao.GameNotice.Ctx(ctx)
@ -92,7 +89,6 @@ func (c *gameNoticeImpl) GetGameNotice(ctx context.Context, req *game.GetGameNot
model := dao.GameNotice.Ctx(ctx)
model = model.Where("notice_type = ?", req.NoticeType)
ip := libUtils.GetClientIp(ctx)
//fmt.Println("ip: ", ip)
var ipList []*entity.GameNotice
err = model.Where("channel=?", ip).Scan(&ipList)
@ -141,9 +137,7 @@ func (c *gameNoticeImpl) GetGameNotice(ctx context.Context, req *game.GetGameNot
res.Status = consts.Notice_Normal
}
if req.NoticeType == consts.Notice_Type_Pop {
} else {
if req.NoticeType != consts.Notice_Type_Pop {
if res.Status == consts.Notice_White_List {
whiteIps, e := internal.GetWhiteList(ctx)
g.Log().Debugf(ctx, "GetGameNotice ip"+ip, len(whiteIps), e)
@ -179,7 +173,7 @@ func (c *gameNoticeImpl) GetGameNoticeList(ctx context.Context, req *game.GetGam
req1.Channel = req.Channel
res2, _ := c.GetGameNotice(ctx, req1)
res.List = append(res.List, game.Notice{Content: res2.Content, Status: res2.Status, TimeStamp: res2.TimeStamp, NoticeType: consts.Notice_Type_Preview})
log.Printf("GetGameNotice res: %s", gjson.MustEncodeString(res.List))
//log.Printf("GetGameNotice res: %s", gjson.MustEncodeString(res.List))
})
return
}

Write Preview
Loading…
Cancel
Save