Merge remote-tracking branch 'origin/master'

internal/dao/internal/admins.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // AdminsColumns defines and stores column names for the table admins.
@@ -49,11 +50,12 @@ var adminsColumns = AdminsColumns{
 }
 
 // NewAdminsDao creates and returns a new DAO object for table data access.
-func NewAdminsDao() *AdminsDao {
+func NewAdminsDao(handlers ...gdb.ModelHandler) *AdminsDao {
 	return &AdminsDao{
 		group:    "default",
 		table:    "admins",
 		columns:  adminsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -79,7 +81,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/feedbacks.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // FeedbacksColumns defines and stores column names for the table feedbacks.
@@ -51,11 +52,12 @@ var feedbacksColumns = FeedbacksColumns{
 }
 
 // NewFeedbacksDao creates and returns a new DAO object for table data access.
-func NewFeedbacksDao() *FeedbacksDao {
+func NewFeedbacksDao(handlers ...gdb.ModelHandler) *FeedbacksDao {
 	return &FeedbacksDao{
 		group:    "default",
 		table:    "feedbacks",
 		columns:  feedbacksColumns,
+		handlers: handlers,
 	}
 }
 
@@ -81,7 +83,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/games.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // GamesColumns defines and stores column names for the table games.
@@ -45,11 +46,12 @@ var gamesColumns = GamesColumns{
 }
 
 // NewGamesDao creates and returns a new DAO object for table data access.
-func NewGamesDao() *GamesDao {
+func NewGamesDao(handlers ...gdb.ModelHandler) *GamesDao {
 	return &GamesDao{
 		group:    "default",
 		table:    "games",
 		columns:  gamesColumns,
+		handlers: handlers,
 	}
 }
 
@@ -75,7 +77,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/merchant_admins.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // MerchantAdminsColumns defines and stores column names for the table merchant_admins.
@@ -57,11 +58,12 @@ var merchantAdminsColumns = MerchantAdminsColumns{
 }
 
 // NewMerchantAdminsDao creates and returns a new DAO object for table data access.
-func NewMerchantAdminsDao() *MerchantAdminsDao {
+func NewMerchantAdminsDao(handlers ...gdb.ModelHandler) *MerchantAdminsDao {
 	return &MerchantAdminsDao{
 		group:    "default",
 		table:    "merchant_admins",
 		columns:  merchantAdminsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -87,7 +89,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/merchants.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // MerchantsColumns defines and stores column names for the table merchants.
@@ -71,11 +72,12 @@ var merchantsColumns = MerchantsColumns{
 }
 
 // NewMerchantsDao creates and returns a new DAO object for table data access.
-func NewMerchantsDao() *MerchantsDao {
+func NewMerchantsDao(handlers ...gdb.ModelHandler) *MerchantsDao {
 	return &MerchantsDao{
 		group:    "default",
 		table:    "merchants",
 		columns:  merchantsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -101,7 +103,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/notices.go

@@ -16,6 +16,7 @@ type NoticesDao 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  NoticesColumns     // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler // handlers for customized model modification.
 }
 
 // NoticesColumns defines and stores column names for the table notices.
@@ -49,11 +50,12 @@ var noticesColumns = NoticesColumns{
 }
 
 // NewNoticesDao creates and returns a new DAO object for table data access.
-func NewNoticesDao() *NoticesDao {
+func NewNoticesDao(handlers ...gdb.ModelHandler) *NoticesDao {
 	return &NoticesDao{
 		group:    "default",
 		table:    "notices",
 		columns:  noticesColumns,
+		handlers: handlers,
 	}
 }
 
@@ -79,7 +81,11 @@ func (dao *NoticesDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *NoticesDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/reward_callback.go

@@ -16,6 +16,7 @@ type RewardCallbackDao 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  RewardCallbackColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler    // handlers for customized model modification.
 }
 
 // RewardCallbackColumns defines and stores column names for the table reward_callback.
@@ -49,11 +50,12 @@ var rewardCallbackColumns = RewardCallbackColumns{
 }
 
 // NewRewardCallbackDao creates and returns a new DAO object for table data access.
-func NewRewardCallbackDao() *RewardCallbackDao {
+func NewRewardCallbackDao(handlers ...gdb.ModelHandler) *RewardCallbackDao {
 	return &RewardCallbackDao{
 		group:    "default",
 		table:    "reward_callback",
 		columns:  rewardCallbackColumns,
+		handlers: handlers,
 	}
 }
 
@@ -79,7 +81,11 @@ func (dao *RewardCallbackDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *RewardCallbackDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/reward_types.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // RewardTypesColumns defines and stores column names for the table reward_types.
@@ -45,11 +46,12 @@ var rewardTypesColumns = RewardTypesColumns{
 }
 
 // NewRewardTypesDao creates and returns a new DAO object for table data access.
-func NewRewardTypesDao() *RewardTypesDao {
+func NewRewardTypesDao(handlers ...gdb.ModelHandler) *RewardTypesDao {
 	return &RewardTypesDao{
 		group:    "default",
 		table:    "reward_types",
 		columns:  rewardTypesColumns,
+		handlers: handlers,
 	}
 }
 
@@ -75,7 +77,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/reward_waters.go

@@ -16,6 +16,7 @@ type RewardWatersDao 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  RewardWatersColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler  // handlers for customized model modification.
 }
 
 // RewardWatersColumns defines and stores column names for the table reward_waters.
@@ -47,11 +48,12 @@ var rewardWatersColumns = RewardWatersColumns{
 }
 
 // NewRewardWatersDao creates and returns a new DAO object for table data access.
-func NewRewardWatersDao() *RewardWatersDao {
+func NewRewardWatersDao(handlers ...gdb.ModelHandler) *RewardWatersDao {
 	return &RewardWatersDao{
 		group:    "default",
 		table:    "reward_waters",
 		columns:  rewardWatersColumns,
+		handlers: handlers,
 	}
 }
 
@@ -77,7 +79,11 @@ func (dao *RewardWatersDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *RewardWatersDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/rewards.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // RewardsColumns defines and stores column names for the table rewards.
@@ -75,11 +76,12 @@ var rewardsColumns = RewardsColumns{
 }
 
 // NewRewardsDao creates and returns a new DAO object for table data access.
-func NewRewardsDao() *RewardsDao {
+func NewRewardsDao(handlers ...gdb.ModelHandler) *RewardsDao {
 	return &RewardsDao{
 		group:    "default",
 		table:    "rewards",
 		columns:  rewardsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -105,7 +107,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/roles.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // RolesColumns defines and stores column names for the table roles.
@@ -47,11 +48,12 @@ var rolesColumns = RolesColumns{
 }
 
 // NewRolesDao creates and returns a new DAO object for table data access.
-func NewRolesDao() *RolesDao {
+func NewRolesDao(handlers ...gdb.ModelHandler) *RolesDao {
 	return &RolesDao{
 		group:    "default",
 		table:    "roles",
 		columns:  rolesColumns,
+		handlers: handlers,
 	}
 }
 
@@ -77,7 +79,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_admins.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // StoreAdminsColumns defines and stores column names for the table store_admins.
@@ -57,11 +58,12 @@ var storeAdminsColumns = StoreAdminsColumns{
 }
 
 // NewStoreAdminsDao creates and returns a new DAO object for table data access.
-func NewStoreAdminsDao() *StoreAdminsDao {
+func NewStoreAdminsDao(handlers ...gdb.ModelHandler) *StoreAdminsDao {
 	return &StoreAdminsDao{
 		group:    "default",
 		table:    "store_admins",
 		columns:  storeAdminsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -87,7 +89,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_areas.go

@@ -16,6 +16,7 @@ type StoreAreasDao 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  StoreAreasColumns  // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler // handlers for customized model modification.
 }
 
 // StoreAreasColumns defines and stores column names for the table store_areas.
@@ -39,11 +40,12 @@ var storeAreasColumns = StoreAreasColumns{
 }
 
 // NewStoreAreasDao creates and returns a new DAO object for table data access.
-func NewStoreAreasDao() *StoreAreasDao {
+func NewStoreAreasDao(handlers ...gdb.ModelHandler) *StoreAreasDao {
 	return &StoreAreasDao{
 		group:    "default",
 		table:    "store_areas",
 		columns:  storeAreasColumns,
+		handlers: handlers,
 	}
 }
 
@@ -69,7 +71,11 @@ func (dao *StoreAreasDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreAreasDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_client_sessions.go

@@ -16,6 +16,7 @@ type StoreClientSessionsDao 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  StoreClientSessionsColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler         // handlers for customized model modification.
 }
 
 // StoreClientSessionsColumns defines and stores column names for the table store_client_sessions.
@@ -57,11 +58,12 @@ var storeClientSessionsColumns = StoreClientSessionsColumns{
 }
 
 // NewStoreClientSessionsDao creates and returns a new DAO object for table data access.
-func NewStoreClientSessionsDao() *StoreClientSessionsDao {
+func NewStoreClientSessionsDao(handlers ...gdb.ModelHandler) *StoreClientSessionsDao {
 	return &StoreClientSessionsDao{
 		group:    "default",
 		table:    "store_client_sessions",
 		columns:  storeClientSessionsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -87,7 +89,11 @@ func (dao *StoreClientSessionsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreClientSessionsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_clients.go

@@ -16,6 +16,7 @@ type StoreClientsDao 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  StoreClientsColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler  // handlers for customized model modification.
 }
 
 // StoreClientsColumns defines and stores column names for the table store_clients.
@@ -43,11 +44,12 @@ var storeClientsColumns = StoreClientsColumns{
 }
 
 // NewStoreClientsDao creates and returns a new DAO object for table data access.
-func NewStoreClientsDao() *StoreClientsDao {
+func NewStoreClientsDao(handlers ...gdb.ModelHandler) *StoreClientsDao {
 	return &StoreClientsDao{
 		group:    "default",
 		table:    "store_clients",
 		columns:  storeClientsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -73,7 +75,11 @@ func (dao *StoreClientsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreClientsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_desktop_settings.go

@@ -16,6 +16,7 @@ type StoreDesktopSettingsDao 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  StoreDesktopSettingsColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler          // handlers for customized model modification.
 }
 
 // StoreDesktopSettingsColumns defines and stores column names for the table store_desktop_settings.
@@ -33,11 +34,12 @@ var storeDesktopSettingsColumns = StoreDesktopSettingsColumns{
 }
 
 // NewStoreDesktopSettingsDao creates and returns a new DAO object for table data access.
-func NewStoreDesktopSettingsDao() *StoreDesktopSettingsDao {
+func NewStoreDesktopSettingsDao(handlers ...gdb.ModelHandler) *StoreDesktopSettingsDao {
 	return &StoreDesktopSettingsDao{
 		group:    "default",
 		table:    "store_desktop_settings",
 		columns:  storeDesktopSettingsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -63,7 +65,11 @@ func (dao *StoreDesktopSettingsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreDesktopSettingsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_ips.go

@@ -16,6 +16,7 @@ type StoreIpsDao 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  StoreIpsColumns    // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler // handlers for customized model modification.
 }
 
 // StoreIpsColumns defines and stores column names for the table store_ips.
@@ -41,11 +42,12 @@ var storeIpsColumns = StoreIpsColumns{
 }
 
 // NewStoreIpsDao creates and returns a new DAO object for table data access.
-func NewStoreIpsDao() *StoreIpsDao {
+func NewStoreIpsDao(handlers ...gdb.ModelHandler) *StoreIpsDao {
 	return &StoreIpsDao{
 		group:    "default",
 		table:    "store_ips",
 		columns:  storeIpsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -71,7 +73,11 @@ func (dao *StoreIpsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreIpsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_member_levels.go

@@ -16,6 +16,7 @@ type StoreMemberLevelsDao 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  StoreMemberLevelsColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler       // handlers for customized model modification.
 }
 
 // StoreMemberLevelsColumns defines and stores column names for the table store_member_levels.
@@ -47,11 +48,12 @@ var storeMemberLevelsColumns = StoreMemberLevelsColumns{
 }
 
 // NewStoreMemberLevelsDao creates and returns a new DAO object for table data access.
-func NewStoreMemberLevelsDao() *StoreMemberLevelsDao {
+func NewStoreMemberLevelsDao(handlers ...gdb.ModelHandler) *StoreMemberLevelsDao {
 	return &StoreMemberLevelsDao{
 		group:    "default",
 		table:    "store_member_levels",
 		columns:  storeMemberLevelsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -77,7 +79,11 @@ func (dao *StoreMemberLevelsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreMemberLevelsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_netfee_area_level.go

@@ -16,6 +16,7 @@ type StoreNetfeeAreaLevelDao 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  StoreNetfeeAreaLevelColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler          // handlers for customized model modification.
 }
 
 // StoreNetfeeAreaLevelColumns defines and stores column names for the table store_netfee_area_level.
@@ -45,11 +46,12 @@ var storeNetfeeAreaLevelColumns = StoreNetfeeAreaLevelColumns{
 }
 
 // NewStoreNetfeeAreaLevelDao creates and returns a new DAO object for table data access.
-func NewStoreNetfeeAreaLevelDao() *StoreNetfeeAreaLevelDao {
+func NewStoreNetfeeAreaLevelDao(handlers ...gdb.ModelHandler) *StoreNetfeeAreaLevelDao {
 	return &StoreNetfeeAreaLevelDao{
 		group:    "default",
 		table:    "store_netfee_area_level",
 		columns:  storeNetfeeAreaLevelColumns,
+		handlers: handlers,
 	}
 }
 
@@ -75,7 +77,11 @@ func (dao *StoreNetfeeAreaLevelDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreNetfeeAreaLevelDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/store_roles.go

@@ -16,6 +16,7 @@ type StoreRolesDao 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  StoreRolesColumns  // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler // handlers for customized model modification.
 }
 
 // StoreRolesColumns defines and stores column names for the table store_roles.
@@ -39,11 +40,12 @@ var storeRolesColumns = StoreRolesColumns{
 }
 
 // NewStoreRolesDao creates and returns a new DAO object for table data access.
-func NewStoreRolesDao() *StoreRolesDao {
+func NewStoreRolesDao(handlers ...gdb.ModelHandler) *StoreRolesDao {
 	return &StoreRolesDao{
 		group:    "default",
 		table:    "store_roles",
 		columns:  storeRolesColumns,
+		handlers: handlers,
 	}
 }
 
@@ -69,7 +71,11 @@ func (dao *StoreRolesDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *StoreRolesDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/stores.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // StoresColumns defines and stores column names for the table stores.
@@ -51,11 +52,12 @@ var storesColumns = StoresColumns{
 }
 
 // NewStoresDao creates and returns a new DAO object for table data access.
-func NewStoresDao() *StoresDao {
+func NewStoresDao(handlers ...gdb.ModelHandler) *StoresDao {
 	return &StoresDao{
 		group:    "default",
 		table:    "stores",
 		columns:  storesColumns,
+		handlers: handlers,
 	}
 }
 
@@ -81,7 +83,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/task_rewards.go

@@ -16,6 +16,7 @@ type TaskRewardsDao 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  TaskRewardsColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler // handlers for customized model modification.
 }
 
 // TaskRewardsColumns defines and stores column names for the table task_rewards.
@@ -35,11 +36,12 @@ var taskRewardsColumns = TaskRewardsColumns{
 }
 
 // NewTaskRewardsDao creates and returns a new DAO object for table data access.
-func NewTaskRewardsDao() *TaskRewardsDao {
+func NewTaskRewardsDao(handlers ...gdb.ModelHandler) *TaskRewardsDao {
 	return &TaskRewardsDao{
 		group:    "default",
 		table:    "task_rewards",
 		columns:  taskRewardsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -65,7 +67,11 @@ func (dao *TaskRewardsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *TaskRewardsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/tasks.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // TasksColumns defines and stores column names for the table tasks.
@@ -45,11 +46,12 @@ var tasksColumns = TasksColumns{
 }
 
 // NewTasksDao creates and returns a new DAO object for table data access.
-func NewTasksDao() *TasksDao {
+func NewTasksDao(handlers ...gdb.ModelHandler) *TasksDao {
 	return &TasksDao{
 		group:    "default",
 		table:    "tasks",
 		columns:  tasksColumns,
+		handlers: handlers,
 	}
 }
 
@@ -75,7 +77,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/user_task_rewards.go

@@ -16,6 +16,7 @@ type UserTaskRewardsDao 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  UserTaskRewardsColumns // columns contains all the column names of Table for convenient usage.
+	handlers []gdb.ModelHandler     // handlers for customized model modification.
 }
 
 // UserTaskRewardsColumns defines and stores column names for the table user_task_rewards.
@@ -57,11 +58,12 @@ var userTaskRewardsColumns = UserTaskRewardsColumns{
 }
 
 // NewUserTaskRewardsDao creates and returns a new DAO object for table data access.
-func NewUserTaskRewardsDao() *UserTaskRewardsDao {
+func NewUserTaskRewardsDao(handlers ...gdb.ModelHandler) *UserTaskRewardsDao {
 	return &UserTaskRewardsDao{
 		group:    "default",
 		table:    "user_task_rewards",
 		columns:  userTaskRewardsColumns,
+		handlers: handlers,
 	}
 }
 
@@ -87,7 +89,11 @@ func (dao *UserTaskRewardsDao) Group() string {
 
 // Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
 func (dao *UserTaskRewardsDao) Ctx(ctx context.Context) *gdb.Model {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/user_tasks.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // UserTasksColumns defines and stores column names for the table user_tasks.
@@ -57,11 +58,12 @@ var userTasksColumns = UserTasksColumns{
 }
 
 // NewUserTasksDao creates and returns a new DAO object for table data access.
-func NewUserTasksDao() *UserTasksDao {
+func NewUserTasksDao(handlers ...gdb.ModelHandler) *UserTasksDao {
 	return &UserTasksDao{
 		group:    "default",
 		table:    "user_tasks",
 		columns:  userTasksColumns,
+		handlers: handlers,
 	}
 }
 
@@ -87,7 +89,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/dao/internal/users.go

@@ -16,6 +16,7 @@ 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.
 }
 
 // UsersColumns defines and stores column names for the table users.
@@ -61,11 +62,12 @@ var usersColumns = UsersColumns{
 }
 
 // NewUsersDao creates and returns a new DAO object for table data access.
-func NewUsersDao() *UsersDao {
+func NewUsersDao(handlers ...gdb.ModelHandler) *UsersDao {
 	return &UsersDao{
 		group:    "default",
 		table:    "users",
 		columns:  usersColumns,
+		handlers: handlers,
 	}
 }
 
@@ -91,7 +93,11 @@ 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 {
-	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+	model := dao.DB().Model(dao.table)
+	for _, handler := range dao.handlers {
+		model = handler(model)
+	}
+	return model.Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.

internal/logic/reward/reward.go

@@ -627,6 +627,16 @@ func (s *sReward) GetLift(ctx context.Context, in *model.GetRewardIn) (out *mode
 				if err != nil {
 					return ecode.Fail.Sub("序列化 json 数据出现异常")
 				}
+
+				exist, err := dao.RewardWaters.Ctx(ctx).Where(do.RewardWaters{OrderId: item.Water.OrderId}).Exist()
+
+				if exist {
+					_, err := dao.RewardWaters.Ctx(ctx).Where(do.RewardWaters{OrderId: item.Water.OrderId}).Delete()
+					if err != nil {
+						return ecode.Fail.Sub("删除奖励领取记录异常")
+					}
+				}
+
 				_, err = dao.RewardWaters.Ctx(ctx).Insert(model.RewardWaters{
 					OrderId: item.Water.OrderId,
 					Status:  int64(item.Result),
@@ -1142,6 +1152,19 @@ func (s *sReward) CallBack(ctx context.Context, in *model.RewardCallbackIn) (out
 		res.Errcode = consts.BatchTotalLimit
 		res.Errmsg = consts.BatchTotalLimitMSG
 	}
+
+	if err = dao.RewardWaters.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		exist, err := dao.RewardCallback.Ctx(ctx).Where(do.RewardCallback{OrderId: in.OrderId}).Exist()
+		if err != nil {
+			return ecode.Fail.Sub("查询回调记录异常")
+		}
+
+		if exist {
+			_, err = dao.RewardCallback.Ctx(ctx).Where(do.RewardCallback{OrderId: in.OrderId}).Delete()
+			if err != nil {
+				return ecode.Fail.Sub("删除回调记录异常")
+			}
+		}
 		_, err = dao.RewardCallback.Ctx(ctx).OmitEmptyData().Insert(do.RewardCallback{
 			OrderId:      in.OrderId,
 			PrizeId:      in.PrizeId,
@@ -1153,6 +1176,13 @@ func (s *sReward) CallBack(ctx context.Context, in *model.RewardCallbackIn) (out
 			AppId:        in.AppId,
 			InnerOrderId: fmt.Sprintf("reward%s", guid.S()),
 		})
+		return err
+	}); err != nil {
+		res.Errcode = -1
+		res.Errmsg = "存储奖励回调数据异常"
+		res.Datas = nil
+		return &res, ecode.Fail.Sub("存储奖励回调数据异常")
+	}
 
 	if err != nil {
 		res.Errcode = -1

internal/logic/task/task.go

@@ -522,15 +522,15 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out
 				// 存在用户记录，自行判断用户是否完成任务
 				if v.UserTimes-one["user_times"].Int64() >= v.TargetTimes {
 					completeTime := gtime.Now()
-
-					// 用户任务完成修改任务记录完成时间
-					_, err := dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: v.TaskID}).Data(do.UserTasks{CompletedAt: completeTime}).Update()
-					if err != nil {
-						return nil, ecode.Fail.Sub("修改用户任务完成时间失败")
-					}
 					userTaskStatus := one["status"].Int64()
 					if userTaskStatus == 1 {
 						if err := dao.UserTasks.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
+							// 用户任务完成修改任务记录完成时间
+							_, err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: v.TaskID}).Data(do.UserTasks{CompletedAt: completeTime}).Update()
+							if err != nil {
+								return ecode.Fail.Sub("修改用户任务完成时间失败")
+							}
+
 							if _, err := dao.UserTasks.Ctx(ctx).WherePri(one["id"].Int64()).Where(do.UserTasks{Status: 1}).Data(do.UserTasks{Status: 3}).Update(); err != nil {
 								return ecode.Fail.Sub("修改用户任务状态失败")
 							}