diff --git a/api/v1/game/pub.go b/api/v1/game/pub.go index 3c8b585..ef0e4fe 100644 --- a/api/v1/game/pub.go +++ b/api/v1/game/pub.go @@ -110,6 +110,11 @@ 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 { diff --git a/internal/controller/baseinfo_role.go b/internal/controller/baseinfo_role.go index c3885b1..836baac 100644 --- a/internal/controller/baseinfo_role.go +++ b/internal/controller/baseinfo_role.go @@ -67,11 +67,6 @@ func (c *gameRoleController) RegisterCount(ctx context.Context, req *game.Regist return res, err } -//func (c *gameRoleController) ShopRecords(ctx context.Context, req *game.ShopRecordReq) (res *game.ShopRecordRes, err error) { -// res, err = serviceGame.GameManage().ShopRecords(ctx, req) -// return res, err -//} - func (c *gameRoleController) GameUserDel(ctx context.Context, req *game.UserDelReq) (res *game.UserDelRes, err error) { res, err = serviceGame.GameRole().GameUserDel(ctx, req) return res, err diff --git a/internal/dao/internal/login_logout_info.go b/internal/dao/internal/login_logout_info.go index b1281e2..ad84f5d 100644 --- a/internal/dao/internal/login_logout_info.go +++ b/internal/dao/internal/login_logout_info.go @@ -37,6 +37,11 @@ type LoginLogoutInfoColumns struct { RechargeTotal string // StoreSum string // StoneAmount string // + Item7307 string // + Item7315 string // + Item7316 string // + Item7319 string // + Item7312 string // } // loginLogoutInfoColumns holds the columns for table login_logout_info. @@ -58,6 +63,11 @@ var loginLogoutInfoColumns = LoginLogoutInfoColumns{ RechargeTotal: "rechargeTotal", StoreSum: "storeSum", StoneAmount: "stoneAmount", + Item7307: "item7307", + Item7315: "item7315", + Item7316: "item7316", + Item7319: "item7319", + Item7312: "item7312", } // NewLoginLogoutInfoDao creates and returns a new DAO object for table data access. diff --git a/internal/model/do/login_logout_info.go b/internal/model/do/login_logout_info.go index a7041ab..4f32ac3 100644 --- a/internal/model/do/login_logout_info.go +++ b/internal/model/do/login_logout_info.go @@ -29,4 +29,9 @@ type LoginLogoutInfo struct { RechargeTotal interface{} // StoreSum interface{} // StoneAmount interface{} // + Item7307 interface{} // + Item7315 interface{} // + Item7316 interface{} // + Item7319 interface{} // + Item7312 interface{} // } diff --git a/internal/model/entity/login_logout_info.go b/internal/model/entity/login_logout_info.go index 9baa446..fa8a3f3 100644 --- a/internal/model/entity/login_logout_info.go +++ b/internal/model/entity/login_logout_info.go @@ -27,4 +27,9 @@ type LoginLogoutInfo struct { RechargeTotal int `json:"rechargeTotal" description:""` StoreSum int `json:"storeSum" description:""` StoneAmount int `json:"stoneAmount" description:""` + Item7307 int `json:"item7307" description:""` + Item7315 int `json:"item7315" description:""` + Item7316 int `json:"item7316" description:""` + Item7319 int `json:"item7319" description:""` + Item7312 int `json:"item7312" description:""` } diff --git a/internal/serviceGame/internal/basicinfo.go b/internal/serviceGame/internal/basicinfo.go index 6931dcc..bd067bb 100644 --- a/internal/serviceGame/internal/basicinfo.go +++ b/internal/serviceGame/internal/basicinfo.go @@ -889,6 +889,11 @@ 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 gtime.Timestamp()-online[req.Server] > 2 { diff --git a/internal/serviceGame/rank.go b/internal/serviceGame/rank.go index bbc9c33..f9d8329 100644 --- a/internal/serviceGame/rank.go +++ b/internal/serviceGame/rank.go @@ -5,7 +5,6 @@ import ( "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" "tyj_admin/api/v1/game" @@ -122,7 +121,8 @@ func (r *gameRankImpl) DeleteGameRank(ctx context.Context, req *game.DeleteGameR } fmt.Println("DeleteGameRank: ", gjson.MustEncodeString(json)) if json.Get("Error").Int() == 200 { - return nil, gerror.New(json.Get("Message").String()) + res.Mess = json.Get("Message").String() + return } return }