修改PC任务领取

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_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.
@@ -33,6 +34,7 @@ type UserTasksColumns struct {
 	TaskName     string // 任务名称
 	GameId       string // 游戏 id
 	TaskType     string // 1: 每日任务 3: 周期任务
+	UserTimes    string // 用户完成次数
 }
 
 // userTasksColumns holds the columns for the table user_tasks.
@@ -50,14 +52,16 @@ var userTasksColumns = UserTasksColumns{
 	TaskName:     "task_name",
 	GameId:       "game_id",
 	TaskType:     "task_type",
+	UserTimes:    "user_times",
 }
 
 // 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,
 	}
 }
 
@@ -83,7 +87,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.
@@ -36,8 +37,6 @@ type UsersColumns struct {
 	DeletedAt        string // 软删除时间
 	RoleId           string // 角色ID
 	LastLoginStoreId string // 上次登录门店ID
-	Quan8Uuid        string // 8圈使用的 uuid
-	XyUserId         string // 系统唯一用户ID
 }
 
 // usersColumns holds the columns for the table users.
@@ -58,16 +57,15 @@ var usersColumns = UsersColumns{
 	DeletedAt:        "deleted_at",
 	RoleId:           "role_id",
 	LastLoginStoreId: "last_login_store_id",
-	Quan8Uuid:        "quan8_uuid",
-	XyUserId:         "xy_user_id",
 }
 
 // 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,
 	}
 }
 
@@ -93,7 +91,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/task/task.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/guid"
 	"server/internal/consts"
 	"server/internal/dao"
 	"server/internal/model"
@@ -343,7 +342,7 @@ func (s *sTask) GetSelectorList(ctx context.Context, in *model.SelectorIn) (out
 	return &data, nil
 }
 
-// GetTask 完成任务
+// GetTask 领取任务
 func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.GetTaskOut, err error) {
 	var storeId int
 	if in.StoreId > 0 {
@@ -377,10 +376,11 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
 		return nil, ecode.Fail.Sub("查询用户该任务记录失败")
 	}
 
-	if userTask != nil {
+	//if userTask != nil {
-		return nil, ecode.Fail.Sub("该任务记录已存在")
+	//	return nil, ecode.Fail.Sub("该任务记录已存在")
-	}
+	//}
 
+	if userTask == nil {
 		// TODO 流水号未知
 		serialNumber, err := snowid.GetSnowClient().GenerateSerialNumber()
 		if err != nil {
@@ -389,7 +389,7 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
 
 		if err = dao.UserTasks.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 			// 创建任务记录
-		id, err := dao.UserTasks.Ctx(ctx).InsertAndGetId(do.UserTasks{
+			_, err = dao.UserTasks.Ctx(ctx).InsertAndGetId(do.UserTasks{
 				UserId:       in.UserId,
 				TaskId:       in.TaskId,
 				StoreId:      storeId,
@@ -404,26 +404,28 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
 			}
 
 			// 查询该任务相关联的奖励, 创建对应奖励下发记录id
-		array, err := dao.TaskRewards.Ctx(ctx).LeftJoin(dao.Rewards.Table(), "rewards.id = task_rewards.reward_id").Where(do.TaskRewards{TaskId: in.TaskId}).Fields(dao.TaskRewards.Columns().RewardId).Fields(dao.Rewards.Columns().Name).All()
+			//array, err := dao.TaskRewards.Ctx(ctx).LeftJoin(dao.Rewards.Table(), "rewards.id = task_rewards.reward_id").Where(do.TaskRewards{TaskId: in.TaskId}).Fields(dao.TaskRewards.Columns().RewardId).Fields(dao.Rewards.Columns().Name).All()
-		if err != nil {
+			//if err != nil {
-			return ecode.Fail.Sub("获取任务关联奖励列表失败")
+			//	return ecode.Fail.Sub("获取任务关联奖励列表失败")
-		}
+			//}
-		for _, v := range array {
+			//for _, v := range array {
-			_, err = dao.UserTaskRewards.Ctx(ctx).Data(do.UserTaskRewards{
+			//	_, err = dao.UserTaskRewards.Ctx(ctx).Data(do.UserTaskRewards{
-				UserTaskId:   id,
+			//		UserTaskId:   id,
-				RewardId:     v["reward_id"].Int64(),
+			//		RewardId:     v["reward_id"].Int64(),
-				RewardName:   v["name"].String(),
+			//		RewardName:   v["name"].String(),
-				Status:       consts.RewardInitStatus,
+			//		Status:       consts.RewardInitStatus,
-				InnerOrderId: fmt.Sprintf("reward%s", guid.S()),
+			//		InnerOrderId: fmt.Sprintf("reward%s", guid.S()),
-			}).Insert()
+			//	}).Insert()
-			if err != nil {
+			//	if err != nil {
-				return ecode.Fail.Sub("创建用户任务奖励记录失败")
+			//		return ecode.Fail.Sub("创建用户任务奖励记录失败")
-			}
+			//	}
-		}
+			//}
 			return
 		}); err != nil {
 			return nil, err
 		}
+	}
+
 	return &model.GetTaskOut{
 		Success: true,
 	}, nil
@@ -682,7 +684,7 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out
 				return nil, ecode.Fail.Sub("获取任务奖励列表失败")
 			}
 
-			if int(v.UserTimes) >= v.TargetTimes {
+			if int(v.UserTimes) >= v.TargetTimes && v.Status == 1 {
 				completedTime := gtime.Now()
 				// 判断当前用户完成情况，已完成根据任务、用户，任务类型检查是否存在用户任务记录
 				orm := dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: v.TaskID})

internal/model/do/user_tasks.go

@@ -25,4 +25,5 @@ type UserTasks struct {
 	TaskName     interface{} // 任务名称
 	GameId       interface{} // 游戏 id
 	TaskType     interface{} // 1: 每日任务 3: 周期任务
+	UserTimes    interface{} // 用户完成次数
 }

internal/model/do/users.go

@@ -28,6 +28,4 @@ type Users struct {
 	DeletedAt        *gtime.Time // 软删除时间
 	RoleId           interface{} // 角色ID
 	LastLoginStoreId interface{} // 上次登录门店ID
-	Quan8Uuid        interface{} // 8圈使用的 uuid
-	XyUserId         interface{} // 系统唯一用户ID
 }

internal/model/entity/user_tasks.go

@@ -23,4 +23,5 @@ type UserTasks struct {
 	TaskName     string      `json:"taskName"     orm:"task_name"     description:"任务名称"`                     // 任务名称
 	GameId       int64       `json:"gameId"       orm:"game_id"       description:"游戏 id"`                    // 游戏 id
 	TaskType     int64       `json:"taskType"     orm:"task_type"     description:"1: 每日任务 3: 周期任务"`          // 1: 每日任务 3: 周期任务
+	UserTimes    int64       `json:"userTimes"    orm:"user_times"    description:"用户完成次数"`                   // 用户完成次数
 }

internal/model/entity/users.go

@@ -26,6 +26,4 @@ type Users struct {
 	DeletedAt        *gtime.Time `json:"deletedAt"        orm:"deleted_at"          description:"软删除时间"`      // 软删除时间
 	RoleId           int64       `json:"roleId"           orm:"role_id"             description:"角色ID"`       // 角色ID
 	LastLoginStoreId int64       `json:"lastLoginStoreId" orm:"last_login_store_id" description:"上次登录门店ID"`   // 上次登录门店ID
-	Quan8Uuid        string      `json:"quan8Uuid"        orm:"quan8_uuid"          description:"8圈使用的 uuid"` // 8圈使用的 uuid
-	XyUserId         string      `json:"xyUserId"         orm:"xy_user_id"          description:"系统唯一用户ID"`   // 系统唯一用户ID
 }

internal/model/userTask.go

@@ -62,6 +62,7 @@ type UserTaskRecord struct {
 	CompletedAt *gtime.Time `json:"completedAt"  orm:"completed_at"  description:"任务完成时间"` // 任务完成时间
 	CreatedAt   *gtime.Time `json:"createdAt"    orm:"created_at"    description:"创建时间"`   // 创建时间
 	// Store        Store       `json:"store"        orm:"with:id=store_id"`
+	UserTimes int64 `json:"userTimes"    orm:"user_times"    description:"用户完成次数"` // 用户完成次数
 }
 
 type UserInfo struct {