Merge remote-tracking branch 'origin/master'

This commit is contained in:
chy
2025-06-17 14:27:28 +08:00
62 changed files with 117 additions and 2260 deletions

View File

@ -1,24 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package do
import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
// RewardTypes is the golang structure of table reward_types for DAO operations like Where/Data.
type RewardTypes struct {
g.Meta `orm:"table:reward_types, do:true"`
Id interface{} // 类型ID
Name interface{} // 类型名称
Code interface{} // 类型编码
Description interface{} // 类型描述
Status interface{} // 状态1=启用2=禁用
CreatedAt *gtime.Time // 创建时间
UpdatedAt *gtime.Time // 更新时间
DeletedAt *gtime.Time // 软删除时间
StoreId interface{} // 门店 id
}

View File

@ -1,29 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package do
import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
// Rewards is the golang structure of table rewards for DAO operations like Where/Data.
type Rewards struct {
g.Meta `orm:"table:rewards, do:true"`
Id interface{} // 奖励唯一标识符
RewardTypeId interface{} // 奖励类型ID
RewardScope interface{} // 奖励范围1=系统奖励2=门店奖励
Name interface{} // 奖励名称
Code interface{} // 奖励编号
Description interface{} // 奖励描述
Status interface{} // 状态1=启用2=禁用
Stock interface{} // 奖励库存0表示无限制
StartAt *gtime.Time // 奖励有效开始时间
ExpireAt *gtime.Time // 奖励有效结束时间
CreatedAt *gtime.Time // 创建时间
UpdatedAt *gtime.Time // 更新时间
DeletedAt *gtime.Time // 软删除时间戳
RemainStock interface{} // 剩余库存数量
}

View File

@ -1,18 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package do
import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
// StoreRewards is the golang structure of table store_rewards for DAO operations like Where/Data.
type StoreRewards struct {
g.Meta `orm:"table:store_rewards, do:true"`
StoreId interface{} // 门店ID
RewardId interface{} // 奖励ID
CreatedAt *gtime.Time // 创建时间
}

View File

@ -1,27 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package do
import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
// StoreTaskRewards is the golang structure of table store_task_rewards for DAO operations like Where/Data.
type StoreTaskRewards struct {
g.Meta `orm:"table:store_task_rewards, do:true"`
Id interface{} // 奖励唯一标识符
TaskId interface{} // 任务ID关联tasks表的id
StoreId interface{} // 门店ID
Name interface{} // 奖励名称
RewardTypeId interface{} // 奖励类型ID
TotalNum interface{} // 奖励总数
UsedNum interface{} // 已使用数量
LimitNum interface{} // 限制数量
CoverImage interface{} // 封面图URL
CreatedAt *gtime.Time // 创建时间
UpdatedAt *gtime.Time // 更新时间
DeletedAt *gtime.Time // 软删除时间戳
}

View File

@ -1,22 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package entity
import (
"github.com/gogf/gf/v2/os/gtime"
)
// RewardTypes is the golang structure for table reward_types.
type RewardTypes struct {
Id int64 `json:"id" orm:"id" description:"类型ID"` // 类型ID
Name string `json:"name" orm:"name" description:"类型名称"` // 类型名称
Code string `json:"code" orm:"code" description:"类型编码"` // 类型编码
Description string `json:"description" orm:"description" 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:"软删除时间"` // 软删除时间
StoreId int64 `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id
}

View File

@ -1,27 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package entity
import (
"github.com/gogf/gf/v2/os/gtime"
)
// Rewards is the golang structure for table rewards.
type Rewards struct {
Id int64 `json:"id" orm:"id" description:"奖励唯一标识符"` // 奖励唯一标识符
RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型ID"` // 奖励类型ID
RewardScope int `json:"rewardScope" orm:"reward_scope" description:"奖励范围1=系统奖励2=门店奖励"` // 奖励范围1=系统奖励2=门店奖励
Name string `json:"name" orm:"name" description:"奖励名称"` // 奖励名称
Code string `json:"code" orm:"code" description:"奖励编号"` // 奖励编号
Description string `json:"description" orm:"description" description:"奖励描述"` // 奖励描述
Status int `json:"status" orm:"status" description:"状态1=启用2=禁用"` // 状态1=启用2=禁用
Stock int `json:"stock" orm:"stock" description:"奖励库存0表示无限制"` // 奖励库存0表示无限制
StartAt *gtime.Time `json:"startAt" orm:"start_at" description:"奖励有效开始时间"` // 奖励有效开始时间
ExpireAt *gtime.Time `json:"expireAt" orm:"expire_at" description:"奖励有效结束时间"` // 奖励有效结束时间
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:"软删除时间戳"` // 软删除时间戳
RemainStock int `json:"remainStock" orm:"remain_stock" description:"剩余库存数量"` // 剩余库存数量
}

View File

@ -1,16 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package entity
import (
"github.com/gogf/gf/v2/os/gtime"
)
// StoreRewards is the golang structure for table store_rewards.
type StoreRewards struct {
StoreId int64 `json:"storeId" orm:"store_id" description:"门店ID"` // 门店ID
RewardId int64 `json:"rewardId" orm:"reward_id" description:"奖励ID"` // 奖励ID
CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"` // 创建时间
}

View File

@ -1,25 +0,0 @@
// =================================================================================
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
// =================================================================================
package entity
import (
"github.com/gogf/gf/v2/os/gtime"
)
// StoreTaskRewards is the golang structure for table store_task_rewards.
type StoreTaskRewards struct {
Id int64 `json:"id" orm:"id" description:"奖励唯一标识符"` // 奖励唯一标识符
TaskId int64 `json:"taskId" orm:"task_id" description:"任务ID关联tasks表的id"` // 任务ID关联tasks表的id
StoreId string `json:"storeId" orm:"store_id" description:"门店ID"` // 门店ID
Name string `json:"name" orm:"name" description:"奖励名称"` // 奖励名称
RewardTypeId string `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型ID"` // 奖励类型ID
TotalNum int `json:"totalNum" orm:"total_num" description:"奖励总数"` // 奖励总数
UsedNum int `json:"usedNum" orm:"used_num" description:"已使用数量"` // 已使用数量
LimitNum int `json:"limitNum" orm:"limit_num" description:"限制数量"` // 限制数量
CoverImage string `json:"coverImage" orm:"cover_image" description:"封面图URL"` // 封面图URL
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:"软删除时间戳"` // 软删除时间戳
}

View File

@ -1,82 +0,0 @@
package model
import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
// Reward 奖励信息
type Reward struct {
g.Meta `orm:"table:rewards"`
ID int64 `json:"id" orm:"id,primary"` // 奖励ID
RewardTypeID int64 `json:"rewardTypeId" orm:"reward_type_id,not null"` // 奖励类型ID
RewardScope int `json:"rewardScope" orm:"reward_scope,not null,default:2"` // 奖励范围1=系统奖励2=门店奖励
Name string `json:"name" orm:"name,not null"` // 奖励名称
Code string `json:"code" orm:"code,unique"` // 奖励编号
Description string `json:"description" orm:"description"` // 奖励描述
Status int `json:"status" orm:"status,default:1"` // 状态1=启用2=禁用
Stock int `json:"stock" orm:"stock,default:0"` // 奖励库存0表示无限制
StartAt *gtime.Time `json:"startAt" orm:"start_at"` // 奖励有效开始时间
ExpireAt *gtime.Time `json:"expireAt" orm:"expire_at"` // 奖励有效结束时间
}
type RewardCreateIn struct {
OperatorId int64 // 操作人ID
OperatorRole string // 操作人角色
RewardTypeID int64 // 奖励类型ID
RewardScope int // 奖励范围1=系统奖励2=门店奖励
Name string // 奖励名称
Description string // 奖励描述
Status int // 状态1=启用2=禁用
Stock int // 奖励库存0表示无限制
StartAt *gtime.Time // 奖励有效开始时间
ExpireAt *gtime.Time // 奖励有效结束时间
StoreIDs []int64 // 关联门店ID列表仅门店奖励需要
}
type RewardUpdateIn struct {
ID int64 // 奖励ID
OperatorId int64 // 操作人ID
OperatorRole string // 操作人角色
RewardTypeID int64 // 奖励类型ID
RewardScope int // 奖励范围1=系统奖励2=门店奖励
Name string // 奖励名称
Description string // 奖励描述
Status int // 状态1=启用2=禁用
Stock int // 奖励库存0表示无限制
StartAt *gtime.Time // 奖励有效开始时间
ExpireAt *gtime.Time // 奖励有效结束时间
StoreIDs []int64 // 关联门店ID列表仅门店奖励需要
}
type RewardListIn struct {
OperatorId int64 // 操作人ID
OperatorRole string // 操作人角色
Page int // 页码
Size int // 每页数量
StoreID *int64 // 门店ID用于过滤门店可见的奖励
RewardTypeID int64 // 奖励类型ID
Name string // 奖励名称(模糊查询)
Status int // 状态1=启用2=禁用
RewardScope int // 奖励范围1=系统奖励2=门店奖励
}
type RewardListOut struct {
List []Reward // 奖励列表
Total int // 总记录数
}
type RewardDeleteIn struct {
ID int64 // 奖励ID
OperatorId int64 // 操作人ID
OperatorRole string // 操作人角色
}
type RewardDetailIn struct {
ID int64 // 奖励ID
}
type RewardDetailOut struct {
*Reward
StoreIDs []int64 // 关联门店ID列表仅门店奖励有值
}

View File

@ -1,68 +0,0 @@
package model
import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
)
type RewardType struct {
g.Meta `orm:"table:reward_type"`
Id int64 `json:"id" dc:"ID" orm:"id,primary"`
Name string `json:"name" dc:"名称" orm:"name"`
Code string `json:"code" dc:"代号" orm:"code"`
Status int `json:"status" dc:"状态1=启用2=禁用" orm:"status"`
Description string `json:"description" dc:"描述" orm:"description"`
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:"删除时间"`
//StoreId int `json:"storeId" dc:"门店ID" orm:"store_id"`
StoreName string `json:"storeName" dc:"门店名称" orm:"store_name"`
}
type RewardTypeIn struct {
Page int
Size int
RoleName string
OperatorId int
}
type RewardTypeOut struct {
List []RewardType
Total int
}
type CreateRewardTypeIn struct {
Name string
Code string
Description string
Status int
StoreId int
}
type CreateRewardTypeOut struct {
Id int64
}
// UpdateRewardTypeIn 更新奖励类型传入参数
type UpdateRewardTypeIn struct {
Id int64
Name string
Code string
Description string
Status int
StoreId int
}
// UpdateRewardTypeOut 更新奖励类型返回参数
type UpdateRewardTypeOut struct {
Success bool
}
// DeleteRewardTypeIn 删除奖励类型传入参数
type DeleteRewardTypeIn struct {
Id int64
}
// DeleteRewardTypeOut 删除奖励类型返回参数
type DeleteRewardTypeOut struct {
Success bool
}

View File

@ -1,22 +0,0 @@
package model
import (
"github.com/gogf/gf/v2/frame/g"
"time"
)
type StoreTaskReward struct {
g.Meta `orm:"table:store_task_rewards"`
Id int64 `orm:"id" json:"id"` // 奖励唯一标识符
TaskId int64 `orm:"task_id" json:"task_id"` // 任务ID关联tasks表的id
StoreId string `orm:"store_id" json:"store_id"` // 门店ID
Name string `orm:"name" json:"name"` // 奖励名称
RewardTypeId string `orm:"reward_type_id" json:"reward_type_id"` // 奖励类型ID
TotalNum int32 `orm:"total_num" json:"total_num"` // 奖励总数
UsedNum int32 `orm:"used_num" json:"used_num"` // 已使用数量
LimitNum int32 `orm:"limit_num" json:"limit_num"` // 限制数量
CoverImage string `orm:"cover_image" json:"cover_image"` // 封面图URL
CreatedAt time.Time `orm:"created_at" json:"created_at"` // 创建时间
UpdatedAt time.Time `orm:"updated_at" json:"updated_at"` // 更新时间
DeletedAt time.Time `orm:"deleted_at" json:"deleted_at"` // 软删除时间戳
}

View File

@ -6,17 +6,16 @@ import (
)
type Tasks struct {
Id int64 `json:"id" orm:"id" description:"任务唯一标识符"` // 任务唯一标识符
QqNetbarTaskId string `json:"qqNetbarTaskId" orm:"qq_netbar_task_id" description:"QQ网吧任务ID"` // QQ网吧任务ID
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:"软删除时间戳"` // 软删除时间戳
QqNetbarTaskName string `json:"qqNetbarTaskName" orm:"qq_netbar_task_name" description:"QQ网吧任务名称"` // QQ网吧任务名称
QqNetbarTaskMemo string `json:"qqNetbarTaskMemo" orm:"qq_netbar_task_memo" description:"任务描述"` // 任务描述
QqNetbarTaskRules string `json:"qqNetbarTaskRules" orm:"qq_netbar_task_rules" description:"任务规则"` // 任务规则
GameId int64 `json:"gameId" orm:"game_id" description:"游戏唯一id"` // 游戏唯一id
StoreId int64 `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id
StoreTaskRewards []StoreTaskReward `json:"storeTaskRewards" orm:"with:task_id=id"`
Id int64 `json:"id" orm:"id" description:"任务唯一标识符"` // 任务唯一标识符
QqNetbarTaskId string `json:"qqNetbarTaskId" orm:"qq_netbar_task_id" description:"QQ网吧任务ID"` // QQ网吧任务ID
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:"软删除时间戳"` // 软删除时间戳
QqNetbarTaskName string `json:"qqNetbarTaskName" orm:"qq_netbar_task_name" description:"QQ网吧任务名称"` // QQ网吧任务名称
QqNetbarTaskMemo string `json:"qqNetbarTaskMemo" orm:"qq_netbar_task_memo" description:"任务描述"` // 任务描述
QqNetbarTaskRules string `json:"qqNetbarTaskRules" orm:"qq_netbar_task_rules" description:"任务规则"` // 任务规则
GameId int64 `json:"gameId" orm:"game_id" description:"游戏唯一id"` // 游戏唯一id
StoreId int64 `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id
}
type GetNonLoginTaskListIn struct {