重命名资源套餐相关结构体和数据库表,新增长效套餐类型
This commit is contained in:
@@ -35,10 +35,10 @@ func newResource(db *gorm.DB, opts ...gen.DOOption) resource {
|
||||
_resource.CreatedAt = field.NewField(tableName, "created_at")
|
||||
_resource.UpdatedAt = field.NewField(tableName, "updated_at")
|
||||
_resource.DeletedAt = field.NewField(tableName, "deleted_at")
|
||||
_resource.Pss = resourceHasOnePss{
|
||||
_resource.Short = resourceHasOneShort{
|
||||
db: db.Session(&gorm.Session{}),
|
||||
|
||||
RelationField: field.NewRelation("Pss", "models.ResourcePss"),
|
||||
RelationField: field.NewRelation("Short", "models.ResourceShort"),
|
||||
}
|
||||
|
||||
_resource.fillFieldMap()
|
||||
@@ -58,7 +58,7 @@ type resource struct {
|
||||
CreatedAt field.Field // 创建时间
|
||||
UpdatedAt field.Field // 更新时间
|
||||
DeletedAt field.Field // 删除时间
|
||||
Pss resourceHasOnePss
|
||||
Short resourceHasOneShort
|
||||
|
||||
fieldMap map[string]field.Expr
|
||||
}
|
||||
@@ -121,13 +121,13 @@ func (r resource) replaceDB(db *gorm.DB) resource {
|
||||
return r
|
||||
}
|
||||
|
||||
type resourceHasOnePss struct {
|
||||
type resourceHasOneShort struct {
|
||||
db *gorm.DB
|
||||
|
||||
field.RelationField
|
||||
}
|
||||
|
||||
func (a resourceHasOnePss) Where(conds ...field.Expr) *resourceHasOnePss {
|
||||
func (a resourceHasOneShort) Where(conds ...field.Expr) *resourceHasOneShort {
|
||||
if len(conds) == 0 {
|
||||
return &a
|
||||
}
|
||||
@@ -140,27 +140,27 @@ func (a resourceHasOnePss) Where(conds ...field.Expr) *resourceHasOnePss {
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a resourceHasOnePss) WithContext(ctx context.Context) *resourceHasOnePss {
|
||||
func (a resourceHasOneShort) WithContext(ctx context.Context) *resourceHasOneShort {
|
||||
a.db = a.db.WithContext(ctx)
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a resourceHasOnePss) Session(session *gorm.Session) *resourceHasOnePss {
|
||||
func (a resourceHasOneShort) Session(session *gorm.Session) *resourceHasOneShort {
|
||||
a.db = a.db.Session(session)
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a resourceHasOnePss) Model(m *models.Resource) *resourceHasOnePssTx {
|
||||
return &resourceHasOnePssTx{a.db.Model(m).Association(a.Name())}
|
||||
func (a resourceHasOneShort) Model(m *models.Resource) *resourceHasOneShortTx {
|
||||
return &resourceHasOneShortTx{a.db.Model(m).Association(a.Name())}
|
||||
}
|
||||
|
||||
type resourceHasOnePssTx struct{ tx *gorm.Association }
|
||||
type resourceHasOneShortTx struct{ tx *gorm.Association }
|
||||
|
||||
func (a resourceHasOnePssTx) Find() (result *models.ResourcePss, err error) {
|
||||
func (a resourceHasOneShortTx) Find() (result *models.ResourceShort, err error) {
|
||||
return result, a.tx.Find(&result)
|
||||
}
|
||||
|
||||
func (a resourceHasOnePssTx) Append(values ...*models.ResourcePss) (err error) {
|
||||
func (a resourceHasOneShortTx) Append(values ...*models.ResourceShort) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
@@ -168,7 +168,7 @@ func (a resourceHasOnePssTx) Append(values ...*models.ResourcePss) (err error) {
|
||||
return a.tx.Append(targetValues...)
|
||||
}
|
||||
|
||||
func (a resourceHasOnePssTx) Replace(values ...*models.ResourcePss) (err error) {
|
||||
func (a resourceHasOneShortTx) Replace(values ...*models.ResourceShort) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
@@ -176,7 +176,7 @@ func (a resourceHasOnePssTx) Replace(values ...*models.ResourcePss) (err error)
|
||||
return a.tx.Replace(targetValues...)
|
||||
}
|
||||
|
||||
func (a resourceHasOnePssTx) Delete(values ...*models.ResourcePss) (err error) {
|
||||
func (a resourceHasOneShortTx) Delete(values ...*models.ResourceShort) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
@@ -184,11 +184,11 @@ func (a resourceHasOnePssTx) Delete(values ...*models.ResourcePss) (err error) {
|
||||
return a.tx.Delete(targetValues...)
|
||||
}
|
||||
|
||||
func (a resourceHasOnePssTx) Clear() error {
|
||||
func (a resourceHasOneShortTx) Clear() error {
|
||||
return a.tx.Clear()
|
||||
}
|
||||
|
||||
func (a resourceHasOnePssTx) Count() int64 {
|
||||
func (a resourceHasOneShortTx) Count() int64 {
|
||||
return a.tx.Count()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user