增加-数据结构

game/game_cluster/internal/mdb/models/cashoutrecord.go

@@ -8,6 +8,7 @@ type CashOutRecord struct {
 	AfterAmount int    `json:"afterAmount" bson:"after_amount"` //
 	Type        int    `json:"type" bson:"type"`                // 货币内型
 	Address     string `json:"address" bson:"address"`          // 地址
+	Withdrawal  int    `json:"withdrawal" bson:"withdrawal"`    // 提现 1:提现成功 2:提现中 3：提现失败 4：拒绝提现
 	CreateAt    int64  `json:"createAt" bson:"createAt"`
 	UpdateAt    int64  `json:"updateAt" bson:"updateAt"`
 }

game/game_cluster/nodes/webadmin/controller/role.go

@@ -65,7 +65,7 @@ func (r *Role) List(ctx *gin.Context) {
 		})
 		return
 	}
-	list, err := new(service.Role).List(ctx, *req)
+	list, err := new(service.Role).List(ctx, req)
 	if err != nil {
 		ctx.JSON(200, gin.H{
 			"code": 400,
@@ -74,9 +74,10 @@ func (r *Role) List(ctx *gin.Context) {
 		return
 	}
 	ctx.JSON(http.StatusOK, gin.H{
-		"code": 200,
-		"msg":  "success",
-		"data": list,
+		"code":  200,
+		"msg":   "success",
+		"data":  list,
+		"count": req.Count,
 	})
 }
 
@@ -388,7 +389,7 @@ func (r *Role) ListAccess(ctx *gin.Context) {
 		})
 		return
 	}
-	list, err := new(service.Role).ListAccess(ctx, *req)
+	list, err := new(service.Role).ListAccess(ctx, req)
 	if err != nil {
 		ctx.JSON(200, gin.H{
 			"code": 400,
@@ -397,9 +398,10 @@ func (r *Role) ListAccess(ctx *gin.Context) {
 		return
 	}
 	ctx.JSON(http.StatusOK, gin.H{
-		"code": 200,
-		"msg":  "success",
-		"data": list,
+		"code":  200,
+		"msg":   "success",
+		"data":  list,
+		"total": req.Count,
 	})
 }
 

game/game_cluster/nodes/webadmin/entity/role.go

@@ -28,6 +28,7 @@ type AccessResp struct {
 type RoleListReq struct {
 	Page   int    `json:"page"  binding:"required" form:"page"`
 	Size   int    `json:"size"  binding:"required" form:"size"`
+	Count  int64  `json:"count" form:"count"`
 	Name   string `json:"name" form:"name"`
 	Status uint   `json:"status" form:"status"`
 }
@@ -66,7 +67,7 @@ type RoleAccessUpdateReq struct {
 }
 
 type RoleAccessDelReq struct {
-	RoleId string `json:"role_id"`
+	RoleId string `json:"role_id" form:"role_id"`
 }
 type Response struct {
 	Code    int    `json:"code"`
@@ -105,6 +106,7 @@ type AccessUpdateReq struct {
 type AccessListReq struct {
 	Page       int    `json:"page" form:"page"`
 	Size       int    `json:"size" form:"size"`
+	Count      int64  `json:"count" form:"count"`
 	ModuleName string `json:"module_name" form:"module_name"`
 	ActionName string `json:"action_name" form:"action_name"`
 	ParentId   string `json:"parent_id" form:"parent_id"`

game/game_cluster/nodes/webadmin/service/role.go

@@ -27,10 +27,9 @@ func NewRole() *Role {
 }
 
 // List 角色列表
-func (r *Role) List(ctx context.Context, req entity.RoleListReq) ([]entity.RoleResp, error) {
+func (r *Role) List(ctx context.Context, req *entity.RoleListReq) ([]entity.RoleResp, error) {
 	roles := models.Roles{}
 	rolesCollection := mdb.MDB.Collection(roles.TableName())
-
 	// 构建过滤器
 	filter := bson.M{}
 	if req.Name != "" {
@@ -39,15 +38,17 @@ func (r *Role) List(ctx context.Context, req entity.RoleListReq) ([]entity.RoleR
 	if req.Status > 0 {
 		filter["status"] = req.Status
 	}
-
 	// 数据验证
 	if req.Page <= 0 || req.Size <= 0 {
 		return nil, fmt.Errorf("invalid page or size")
 	}
-
 	// 设置分页选项
 	findOptions := options.Find().SetSkip(int64((req.Page - 1) * req.Size)).SetLimit(int64(req.Size))
-
+	countDocuments, err := rolesCollection.CountDocuments(ctx, filter)
+	if err != nil {
+		return nil, err
+	}
+	req.Count = countDocuments
 	// 防御性编程
 	tableName := roles.TableName()
 	if tableName == "" {
@@ -389,7 +390,7 @@ func (r *Role) UpdateAccess(ctx context.Context, req entity.AccessUpdateReq) err
 }
 
 // ListAccess listAccessa
-func (r *Role) ListAccess(ctx context.Context, req entity.AccessListReq) ([]*entity.AccessResp, error) {
+func (r *Role) ListAccess(ctx context.Context, req *entity.AccessListReq) ([]*entity.AccessResp, error) {
 	access := models.Access{}
 	collection := mdb.MDB.Collection(access.TableName())
 	filter := bson.M{}
@@ -417,6 +418,12 @@ func (r *Role) ListAccess(ctx context.Context, req entity.AccessListReq) ([]*ent
 	}
 	// 设置分页选项
 	findOptions := options.Find().SetSkip(int64((req.Page - 1) * req.Size)).SetLimit(int64(req.Size))
+	findOptions.SetSort(bson.M{"add_time": -1})
+	countDocuments, err := collection.CountDocuments(ctx, filter)
+	if err != nil {
+		return nil, err
+	}
+	req.Count = countDocuments
 	cursor, err := collection.Find(ctx, filter, findOptions)
 	defer cursor.Close(ctx)
 	if err != nil {

game/game_cluster/nodes/webadmin/service/synthesis.go

@@ -67,6 +67,7 @@ func (s *Synthesis) FindMDBUserLogDaily(req *entity.UserLogDailyReq) ([]entity.U
 	opts := options.Find()
 	opts.SetSkip(int64(skip))
 	opts.SetLimit(int64(req.Size))
+	opts.SetSort(bson.D{{"daily", -1}})
 
 	cursor, err := collection.Find(ctx, filter, opts)
 	if err != nil {
@@ -144,6 +145,7 @@ func (s *Synthesis) FindWithdrawal(req *entity.UserWithdrawalReq) ([]*entity.Use
 	findOptions := options.Find()
 	findOptions.SetSkip(int64((req.Page - 1) * req.Size))
 	findOptions.SetLimit(int64(req.Size))
+	findOptions.SetSort(bson.D{{"createAt", -1}})
 
 	// 获取总数total
 	count, err := collection.CountDocuments(ctx, filter)