Merge remote-tracking branch 'origin/master'

internal/dao/internal/admins.go

@@ -13,10 +13,9 @@ import (
 
 // AdminsDao is the data access object for the table admins.
 type AdminsDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  AdminsColumns      // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string        // table is the underlying table name of the DAO.
+	group   string        // group is the database configuration group name of the current DAO.
+	columns AdminsColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // AdminsColumns defines and stores column names for the table admins.
@@ -50,12 +49,11 @@ var adminsColumns = AdminsColumns{
 }
 
 // NewAdminsDao creates and returns a new DAO object for table data access.
-func NewAdminsDao(handlers ...gdb.ModelHandler) *AdminsDao {
+func NewAdminsDao() *AdminsDao {
 	return &AdminsDao{
-		group:    "default",
-		table:    "admins",
-		columns:  adminsColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "admins",
+		columns: adminsColumns,
 	}
 }
 
@@ -81,11 +79,7 @@ func (dao *AdminsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *AdminsDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/feedbacks.go

@@ -13,10 +13,9 @@ import (
 
 // FeedbacksDao is the data access object for the table feedbacks.
 type FeedbacksDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  FeedbacksColumns   // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string           // table is the underlying table name of the DAO.
+	group   string           // group is the database configuration group name of the current DAO.
+	columns FeedbacksColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // FeedbacksColumns defines and stores column names for the table feedbacks.
@@ -52,12 +51,11 @@ var feedbacksColumns = FeedbacksColumns{
 }
 
 // NewFeedbacksDao creates and returns a new DAO object for table data access.
-func NewFeedbacksDao(handlers ...gdb.ModelHandler) *FeedbacksDao {
+func NewFeedbacksDao() *FeedbacksDao {
 	return &FeedbacksDao{
-		group:    "default",
-		table:    "feedbacks",
-		columns:  feedbacksColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "feedbacks",
+		columns: feedbacksColumns,
 	}
 }
 
@@ -83,11 +81,7 @@ func (dao *FeedbacksDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *FeedbacksDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/games.go

@@ -13,10 +13,9 @@ import (
 
 // GamesDao is the data access object for the table games.
 type GamesDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  GamesColumns       // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string       // table is the underlying table name of the DAO.
+	group   string       // group is the database configuration group name of the current DAO.
+	columns GamesColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // GamesColumns defines and stores column names for the table games.
@@ -44,12 +43,11 @@ var gamesColumns = GamesColumns{
 }
 
 // NewGamesDao creates and returns a new DAO object for table data access.
-func NewGamesDao(handlers ...gdb.ModelHandler) *GamesDao {
+func NewGamesDao() *GamesDao {
 	return &GamesDao{
-		group:    "default",
-		table:    "games",
-		columns:  gamesColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "games",
+		columns: gamesColumns,
 	}
 }
 
@@ -75,11 +73,7 @@ func (dao *GamesDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *GamesDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/merchant_admins.go

@@ -13,10 +13,9 @@ import (
 
 // MerchantAdminsDao is the data access object for the table merchant_admins.
 type MerchantAdminsDao struct {
-	table    string                // table is the underlying table name of the DAO.
-	group    string                // group is the database configuration group name of the current DAO.
-	columns  MerchantAdminsColumns // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler    // handlers for customized model modification.
+	table   string                // table is the underlying table name of the DAO.
+	group   string                // group is the database configuration group name of the current DAO.
+	columns MerchantAdminsColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // MerchantAdminsColumns defines and stores column names for the table merchant_admins.
@@ -58,12 +57,11 @@ var merchantAdminsColumns = MerchantAdminsColumns{
 }
 
 // NewMerchantAdminsDao creates and returns a new DAO object for table data access.
-func NewMerchantAdminsDao(handlers ...gdb.ModelHandler) *MerchantAdminsDao {
+func NewMerchantAdminsDao() *MerchantAdminsDao {
 	return &MerchantAdminsDao{
-		group:    "default",
-		table:    "merchant_admins",
-		columns:  merchantAdminsColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "merchant_admins",
+		columns: merchantAdminsColumns,
 	}
 }
 
@@ -89,11 +87,7 @@ func (dao *MerchantAdminsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *MerchantAdminsDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/merchants.go

@@ -13,10 +13,9 @@ import (
 
 // MerchantsDao is the data access object for the table merchants.
 type MerchantsDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  MerchantsColumns   // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string           // table is the underlying table name of the DAO.
+	group   string           // group is the database configuration group name of the current DAO.
+	columns MerchantsColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // MerchantsColumns defines and stores column names for the table merchants.
@@ -72,12 +71,11 @@ var merchantsColumns = MerchantsColumns{
 }
 
 // NewMerchantsDao creates and returns a new DAO object for table data access.
-func NewMerchantsDao(handlers ...gdb.ModelHandler) *MerchantsDao {
+func NewMerchantsDao() *MerchantsDao {
 	return &MerchantsDao{
-		group:    "default",
-		table:    "merchants",
-		columns:  merchantsColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "merchants",
+		columns: merchantsColumns,
 	}
 }
 
@@ -103,11 +101,7 @@ func (dao *MerchantsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *MerchantsDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/reward_types.go

@@ -13,10 +13,9 @@ import (
 
 // RewardTypesDao is the data access object for the table reward_types.
 type RewardTypesDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  RewardTypesColumns // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string             // table is the underlying table name of the DAO.
+	group   string             // group is the database configuration group name of the current DAO.
+	columns RewardTypesColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // RewardTypesColumns defines and stores column names for the table reward_types.
@@ -46,12 +45,11 @@ var rewardTypesColumns = RewardTypesColumns{
 }
 
 // NewRewardTypesDao creates and returns a new DAO object for table data access.
-func NewRewardTypesDao(handlers ...gdb.ModelHandler) *RewardTypesDao {
+func NewRewardTypesDao() *RewardTypesDao {
 	return &RewardTypesDao{
-		group:    "default",
-		table:    "reward_types",
-		columns:  rewardTypesColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "reward_types",
+		columns: rewardTypesColumns,
 	}
 }
 
@@ -77,11 +75,7 @@ func (dao *RewardTypesDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *RewardTypesDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/rewards.go

@@ -13,10 +13,9 @@ import (
 
 // RewardsDao is the data access object for the table rewards.
 type RewardsDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  RewardsColumns     // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string         // table is the underlying table name of the DAO.
+	group   string         // group is the database configuration group name of the current DAO.
+	columns RewardsColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // RewardsColumns defines and stores column names for the table rewards.
@@ -56,12 +55,11 @@ var rewardsColumns = RewardsColumns{
 }
 
 // NewRewardsDao creates and returns a new DAO object for table data access.
-func NewRewardsDao(handlers ...gdb.ModelHandler) *RewardsDao {
+func NewRewardsDao() *RewardsDao {
 	return &RewardsDao{
-		group:    "default",
-		table:    "rewards",
-		columns:  rewardsColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "rewards",
+		columns: rewardsColumns,
 	}
 }
 
@@ -87,11 +85,7 @@ func (dao *RewardsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *RewardsDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/roles.go

@@ -13,10 +13,9 @@ import (
 
 // RolesDao is the data access object for the table roles.
 type RolesDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  RolesColumns       // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string       // table is the underlying table name of the DAO.
+	group   string       // group is the database configuration group name of the current DAO.
+	columns RolesColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // RolesColumns defines and stores column names for the table roles.
@@ -48,12 +47,11 @@ var rolesColumns = RolesColumns{
 }
 
 // NewRolesDao creates and returns a new DAO object for table data access.
-func NewRolesDao(handlers ...gdb.ModelHandler) *RolesDao {
+func NewRolesDao() *RolesDao {
 	return &RolesDao{
-		group:    "default",
-		table:    "roles",
-		columns:  rolesColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "roles",
+		columns: rolesColumns,
 	}
 }
 
@@ -79,11 +77,7 @@ func (dao *RolesDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *RolesDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_admins.go

@@ -13,10 +13,9 @@ import (
 
 // StoreAdminsDao is the data access object for the table store_admins.
 type StoreAdminsDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  StoreAdminsColumns // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string             // table is the underlying table name of the DAO.
+	group   string             // group is the database configuration group name of the current DAO.
+	columns StoreAdminsColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // StoreAdminsColumns defines and stores column names for the table store_admins.
@@ -58,12 +57,11 @@ var storeAdminsColumns = StoreAdminsColumns{
 }
 
 // NewStoreAdminsDao creates and returns a new DAO object for table data access.
-func NewStoreAdminsDao(handlers ...gdb.ModelHandler) *StoreAdminsDao {
+func NewStoreAdminsDao() *StoreAdminsDao {
 	return &StoreAdminsDao{
-		group:    "default",
-		table:    "store_admins",
-		columns:  storeAdminsColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "store_admins",
+		columns: storeAdminsColumns,
 	}
 }
 
@@ -89,11 +87,7 @@ func (dao *StoreAdminsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreAdminsDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/stores.go

@@ -13,49 +13,49 @@ import (
 
 // StoresDao is the data access object for the table stores.
 type StoresDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  StoresColumns      // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string        // table is the underlying table name of the DAO.
+	group   string        // group is the database configuration group name of the current DAO.
+	columns StoresColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // StoresColumns defines and stores column names for the table stores.
 type StoresColumns struct {
-	Id           string // 门店ID
-	MerchantId   string // 所属商户ID
-	Name         string // 门店名称
-	StoreCode    string // 门店编号
-	Address      string // 门店地址
-	ContactName  string // 联系人姓名
-	ContactPhone string // 联系人电话
-	Status       string // 状态：1=正常营业，2=暂停营业
-	CreatedAt    string // 创建时间
-	UpdatedAt    string // 更新时间
-	DeletedAt    string // 软删除时间戳
+	Id            string // 门店ID
+	MerchantId    string // 所属商户ID
+	Name          string // 门店名称
+	StoreCode     string // 门店编号
+	Address       string // 门店地址
+	ContactName   string // 联系人姓名
+	ContactPhone  string // 联系人电话
+	NetbarAccount string // QQ 当吧网关账号
+	Status        string // 状态：1=正常营业，2=暂停营业
+	CreatedAt     string // 创建时间
+	UpdatedAt     string // 更新时间
+	DeletedAt     string // 软删除时间戳
 }
 
 // storesColumns holds the columns for the table stores.
 var storesColumns = StoresColumns{
-	Id:           "id",
-	MerchantId:   "merchant_id",
-	Name:         "name",
-	StoreCode:    "store_code",
-	Address:      "address",
-	ContactName:  "contact_name",
-	ContactPhone: "contact_phone",
-	Status:       "status",
-	CreatedAt:    "created_at",
-	UpdatedAt:    "updated_at",
-	DeletedAt:    "deleted_at",
+	Id:            "id",
+	MerchantId:    "merchant_id",
+	Name:          "name",
+	StoreCode:     "store_code",
+	Address:       "address",
+	ContactName:   "contact_name",
+	ContactPhone:  "contact_phone",
+	NetbarAccount: "netbar_account",
+	Status:        "status",
+	CreatedAt:     "created_at",
+	UpdatedAt:     "updated_at",
+	DeletedAt:     "deleted_at",
 }
 
 // NewStoresDao creates and returns a new DAO object for table data access.
-func NewStoresDao(handlers ...gdb.ModelHandler) *StoresDao {
+func NewStoresDao() *StoresDao {
 	return &StoresDao{
-		group:    "default",
-		table:    "stores",
-		columns:  storesColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "stores",
+		columns: storesColumns,
 	}
 }
 
@@ -81,11 +81,7 @@ func (dao *StoresDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoresDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/tasks.go

@@ -13,10 +13,9 @@ import (
 
 // TasksDao is the data access object for the table tasks.
 type TasksDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  TasksColumns       // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string       // table is the underlying table name of the DAO.
+	group   string       // group is the database configuration group name of the current DAO.
+	columns TasksColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // TasksColumns defines and stores column names for the table tasks.
@@ -38,12 +37,11 @@ var tasksColumns = TasksColumns{
 }
 
 // NewTasksDao creates and returns a new DAO object for table data access.
-func NewTasksDao(handlers ...gdb.ModelHandler) *TasksDao {
+func NewTasksDao() *TasksDao {
 	return &TasksDao{
-		group:    "default",
-		table:    "tasks",
-		columns:  tasksColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "tasks",
+		columns: tasksColumns,
 	}
 }
 
@@ -69,11 +67,7 @@ func (dao *TasksDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *TasksDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/user_tasks.go

@@ -13,10 +13,9 @@ import (
 
 // UserTasksDao is the data access object for the table user_tasks.
 type UserTasksDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  UserTasksColumns   // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string           // table is the underlying table name of the DAO.
+	group   string           // group is the database configuration group name of the current DAO.
+	columns UserTasksColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // UserTasksColumns defines and stores column names for the table user_tasks.
@@ -48,12 +47,11 @@ var userTasksColumns = UserTasksColumns{
 }
 
 // NewUserTasksDao creates and returns a new DAO object for table data access.
-func NewUserTasksDao(handlers ...gdb.ModelHandler) *UserTasksDao {
+func NewUserTasksDao() *UserTasksDao {
 	return &UserTasksDao{
-		group:    "default",
-		table:    "user_tasks",
-		columns:  userTasksColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "user_tasks",
+		columns: userTasksColumns,
 	}
 }
 
@@ -79,11 +77,7 @@ func (dao *UserTasksDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *UserTasksDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/users.go

@@ -13,10 +13,9 @@ import (
 
 // UsersDao is the data access object for the table users.
 type UsersDao struct {
-	table    string             // table is the underlying table name of the DAO.
-	group    string             // group is the database configuration group name of the current DAO.
-	columns  UsersColumns       // columns contains all the column names of Table for convenient usage.
-	handlers []gdb.ModelHandler // handlers for customized model modification.
+	table   string       // table is the underlying table name of the DAO.
+	group   string       // group is the database configuration group name of the current DAO.
+	columns UsersColumns // columns contains all the column names of Table for convenient usage.
 }
 
 // UsersColumns defines and stores column names for the table users.
@@ -60,12 +59,11 @@ var usersColumns = UsersColumns{
 }
 
 // NewUsersDao creates and returns a new DAO object for table data access.
-func NewUsersDao(handlers ...gdb.ModelHandler) *UsersDao {
+func NewUsersDao() *UsersDao {
 	return &UsersDao{
-		group:    "default",
-		table:    "users",
-		columns:  usersColumns,
-		handlers: handlers,
+		group:   "default",
+		table:   "users",
+		columns: usersColumns,
 	}
 }
 
@@ -91,11 +89,7 @@ func (dao *UsersDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *UsersDao) Ctx(ctx context.Context) *gdb.Model {
-	model := dao.DB().Model(dao.table)
-	for _, handler := range dao.handlers {
-		model = handler(model)
-	}
-	return model.Safe().Ctx(ctx)
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/model/do/stores.go

@@ -11,16 +11,17 @@ import (
 
 // Stores is the golang structure of table stores for DAO operations like Where/Data.
 type Stores struct {
-	g.Meta       `orm:"table:stores, do:true"`
-	Id           interface{} // 门店ID
-	MerchantId   interface{} // 所属商户ID
-	Name         interface{} // 门店名称
-	StoreCode    interface{} // 门店编号
-	Address      interface{} // 门店地址
-	ContactName  interface{} // 联系人姓名
-	ContactPhone interface{} // 联系人电话
-	Status       interface{} // 状态：1=正常营业，2=暂停营业
-	CreatedAt    *gtime.Time // 创建时间
-	UpdatedAt    *gtime.Time // 更新时间
-	DeletedAt    *gtime.Time // 软删除时间戳
+	g.Meta        `orm:"table:stores, do:true"`
+	Id            interface{} // 门店ID
+	MerchantId    interface{} // 所属商户ID
+	Name          interface{} // 门店名称
+	StoreCode     interface{} // 门店编号
+	Address       interface{} // 门店地址
+	ContactName   interface{} // 联系人姓名
+	ContactPhone  interface{} // 联系人电话
+	NetbarAccount interface{} // QQ 当吧网关账号
+	Status        interface{} // 状态：1=正常营业，2=暂停营业
+	CreatedAt     *gtime.Time // 创建时间
+	UpdatedAt     *gtime.Time // 更新时间
+	DeletedAt     *gtime.Time // 软删除时间戳
 }

internal/model/entity/stores.go

@@ -10,15 +10,16 @@ import (
 
 // Stores is the golang structure for table stores.
 type Stores struct {
-	Id           int64       `json:"id"           orm:"id"            description:"门店ID"`             // 门店ID
-	MerchantId   int64       `json:"merchantId"   orm:"merchant_id"   description:"所属商户ID"`           // 所属商户ID
-	Name         string      `json:"name"         orm:"name"          description:"门店名称"`             // 门店名称
-	StoreCode    string      `json:"storeCode"    orm:"store_code"    description:"门店编号"`             // 门店编号
-	Address      string      `json:"address"      orm:"address"       description:"门店地址"`             // 门店地址
-	ContactName  string      `json:"contactName"  orm:"contact_name"  description:"联系人姓名"`            // 联系人姓名
-	ContactPhone string      `json:"contactPhone" orm:"contact_phone" description:"联系人电话"`            // 联系人电话
-	Status       int         `json:"status"       orm:"status"        description:"状态：1=正常营业，2=暂停营业"` // 状态：1=正常营业，2=暂停营业
-	CreatedAt    *gtime.Time `json:"createdAt"    orm:"created_at"    description:"创建时间"`             // 创建时间
-	UpdatedAt    *gtime.Time `json:"updatedAt"    orm:"updated_at"    description:"更新时间"`             // 更新时间
-	DeletedAt    *gtime.Time `json:"deletedAt"    orm:"deleted_at"    description:"软删除时间戳"`           // 软删除时间戳
+	Id            int64       `json:"id"            orm:"id"             description:"门店ID"`             // 门店ID
+	MerchantId    int64       `json:"merchantId"    orm:"merchant_id"    description:"所属商户ID"`           // 所属商户ID
+	Name          string      `json:"name"          orm:"name"           description:"门店名称"`             // 门店名称
+	StoreCode     string      `json:"storeCode"     orm:"store_code"     description:"门店编号"`             // 门店编号
+	Address       string      `json:"address"       orm:"address"        description:"门店地址"`             // 门店地址
+	ContactName   string      `json:"contactName"   orm:"contact_name"   description:"联系人姓名"`            // 联系人姓名
+	ContactPhone  string      `json:"contactPhone"  orm:"contact_phone"  description:"联系人电话"`            // 联系人电话
+	NetbarAccount string      `json:"netbarAccount" orm:"netbar_account" description:"QQ 当吧网关账号"`        // QQ 当吧网关账号
+	Status        int         `json:"status"        orm:"status"         description:"状态：1=正常营业，2=暂停营业"` // 状态：1=正常营业，2=暂停营业
+	CreatedAt     *gtime.Time `json:"createdAt"     orm:"created_at"     description:"创建时间"`             // 创建时间
+	UpdatedAt     *gtime.Time `json:"updatedAt"     orm:"updated_at"     description:"更新时间"`             // 更新时间
+	DeletedAt     *gtime.Time `json:"deletedAt"     orm:"deleted_at"     description:"软删除时间戳"`           // 软删除时间戳
 }

internal/model/store.go

@@ -5,15 +5,16 @@ import (
 )
 
 type Store struct {
-	g.Meta       `orm:"table:stores"` // 绑定表名
-	Id           int64                `json:"id"           orm:"id,primary"               dc:"门店ID"`
-	MerchantId   int64                `json:"merchantId"   orm:"merchant_id,not null"     dc:"所属商户ID"`
-	Name         string               `json:"name"         orm:"name,not null"            dc:"门店名称"`
-	StoreCode    string               `json:"storeCode"    orm:"store_code,unique"        dc:"门店编号"`
-	Address      string               `json:"address"      orm:"address"                  dc:"门店地址"`
-	ContactName  string               `json:"contactName"  orm:"contact_name"             dc:"联系人姓名"`
-	ContactPhone string               `json:"contactPhone" orm:"contact_phone"            dc:"联系人电话"`
-	Status       int                  `json:"status"       orm:"status,default:1"         dc:"状态：1=正常营业，2=暂停营业，3=已关闭"`
+	g.Meta        `orm:"table:stores"` // 绑定表名
+	Id            int64                `json:"id"           orm:"id,primary"               dc:"门店ID"`
+	MerchantId    int64                `json:"merchantId"   orm:"merchant_id,not null"     dc:"所属商户ID"`
+	Name          string               `json:"name"         orm:"name,not null"            dc:"门店名称"`
+	StoreCode     string               `json:"storeCode"    orm:"store_code,unique"        dc:"门店编号"`
+	Address       string               `json:"address"      orm:"address"                  dc:"门店地址"`
+	ContactName   string               `json:"contactName"  orm:"contact_name"             dc:"联系人姓名"`
+	ContactPhone  string               `json:"contactPhone" orm:"contact_phone"            dc:"联系人电话"`
+	Status        int                  `json:"status"       orm:"status,default:1"         dc:"状态：1=正常营业，2=暂停营业，3=已关闭"`
+	NetbarAccount string               `json:"netbarAccount" orm:"netbar_account" dc:"网吧网关账号"`
 }
 
 type StoreCreateIn struct {