新增管理员用户删除，修改反馈，任务列表

internal/logic/game/game.go

@@ -24,7 +24,7 @@ func (s *sGame) GameList(ctx context.Context, in *model.GameListIn) (out *model.
 
 	list := make([]model.Game, 0)
 	var total int
-	err = dao.Games.Ctx(ctx).Page(in.Page, in.Size).ScanAndCount(&list, &total, false)
+	err = dao.Games.Ctx(ctx).Page(in.Page, in.Size).OrderDesc(dao.Games.Columns().CreatedAt).ScanAndCount(&list, &total, false)
 	if err != nil {
 		return nil, ecode.Fail.Sub("游戏列表获取失败")
 	}

internal/logic/rewardType/rewardType.go

@@ -328,6 +328,15 @@ func (s *sRewardType) List(ctx context.Context, in *model.RewardTypeListIn) (out
 		return nil, err
 	}
 
+	if in.OperatorRole == consts.AdminRoleCode {
+		orm = orm.LeftJoin(dao.Stores.Table(), fmt.Sprintf(
+			"%s.%s = %s.%s",
+			dao.RewardTypes.Table(), dao.RewardTypes.Columns().StoreId,
+			dao.Stores.Table(), dao.Stores.Columns().Id),
+		).Fields(fmt.Sprintf("%s.*, %s.%s %s",
+			dao.RewardTypes.Table(), dao.Stores.Table(), dao.Stores.Columns().Name, "storeName"))
+	}
+
 	// 查询分页数据
 	err = orm.Page(in.Page, in.Size).
 		OrderAsc(fmt.Sprintf("%s.%s", dao.RewardTypes.Table(), dao.RewardTypes.Columns().Source)).

internal/logic/task/task.go

@@ -9,6 +9,7 @@ import (
 	"server/internal/model/do"
 	"server/internal/service"
 	"server/utility/ecode"
+	"server/utility/snowid"
 	"server/utility/tencent"
 	"sort"
 	"strconv"
@@ -220,8 +221,12 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.TaskListIn) (out *mod
 	var data []model.Tasks
 	var total int
 	m := dao.Tasks.Ctx(ctx)
-	//err = m.Page(in.Page, in.Size).Where(do.Tasks{GameId: in.Gid, StoreId: in.StoreId}).LeftJoin(dao.StoreTaskRewards.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`task_id`", dao.Tasks.Table(), dao.StoreTaskRewards.Table())).ScanAndCount(&data, &total, false)
-	err = m.Page(in.Page, in.Size).Where(do.Tasks{GameId: in.Gid, StoreId: in.StoreId}).WithAll().ScanAndCount(&data, &total, false)
+
+	if in.StoreId != 0 {
+		m = m.Where(do.Tasks{StoreId: in.StoreId})
+	}
+
+	err = m.Page(in.Page, in.Size).Where(do.Tasks{GameId: in.Gid}).WithAll().ScanAndCount(&data, &total, false)
 
 	if err != nil {
 		return nil, ecode.Fail.Sub("任务列表获取失败")
@@ -250,3 +255,39 @@ func (s *sTask) GetSelectorList(ctx context.Context, in *model.SelectorIn) (out
 	}
 	return &data, nil
 }
+
+// GetTask 完成任务
+func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.GetTaskOut, err error) {
+
+	var userTask []*model.UserTask
+	err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: in.StoreId}).WhereNot("status", 3).Scan(&userTask)
+	if err != nil {
+		return nil, ecode.Fail.Sub("查询用户该任务记录失败")
+	}
+
+	if userTask != nil {
+		return nil, ecode.Fail.Sub("该任务记录已存在")
+	}
+
+	// TODO 流水号未知
+	serialNumber, err := snowid.GetSnowClient().GenerateSerialNumber()
+	if err != nil {
+		return nil, ecode.Fail.Sub("生成流水号异常")
+	}
+
+	dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId})
+	_, err = dao.UserTasks.Ctx(ctx).Insert(do.UserTasks{
+		UserId:       in.UserId,
+		TaskId:       in.TaskId,
+		StoreId:      in.StoreId,
+		Status:       1,
+		SerialNumber: serialNumber,
+	})
+
+	if err != nil {
+		return nil, ecode.Fail.Sub("添加任务记录异常")
+	}
+	return &model.GetTaskOut{
+		Success: true,
+	}, nil
+}

internal/logic/user/user.go

@@ -280,3 +280,22 @@ func (s *sUser) BoundInfo(ctx context.Context, in *model.UserBoundInfoIn) (out *
 		Utype:    result.Utype,
 	}, nil
 }
+
+func (s *sUser) DelUser(ctx context.Context, in *model.DelUserIn) (out *model.DeleteOut, err error) {
+
+	exist, err := dao.Users.Ctx(ctx).Where(do.Users{Id: in.Id}).Exist()
+	if err != nil {
+		return nil, ecode.Fail.Sub("查询该用户失败")
+	}
+
+	if !exist {
+		return nil, ecode.Params.Sub("该用户不存在")
+	}
+
+	_, err = dao.Users.Ctx(ctx).Delete(do.Users{Id: in.Id})
+	if err != nil {
+		return nil, ecode.Fail.Sub("删除用户失败")
+	}
+
+	return &model.DeleteOut{Success: true}, nil
+}