diff --git a/backend/database/migrations/20250109085218_create_tenants.sql b/backend/database/migrations/20250109085218_create_tenants.sql index 23aa901..6b179f5 100644 --- a/backend/database/migrations/20250109085218_create_tenants.sql +++ b/backend/database/migrations/20250109085218_create_tenants.sql @@ -52,4 +52,5 @@ CREATE TABLE -- +goose StatementBegin DROP TABLE tenants; DROP TABLE tenant_users; +DROP TABLE tenant_user_balances; -- +goose StatementEnd diff --git a/backend/database/migrations/20250109094724_create_order.sql b/backend/database/migrations/20250109094724_create_order.sql index 6f188d5..330f903 100644 --- a/backend/database/migrations/20250109094724_create_order.sql +++ b/backend/database/migrations/20250109094724_create_order.sql @@ -20,6 +20,7 @@ CREATE TABLE remote_refund_serial VARCHAR(256) NOT NULL UNIQUE, amount INT8 NOT NULL default 0, currency VARCHAR(32) NOT NULL default 'CNY', + title VARCHAR(128) NOT NULL DEFAULT '', description VARCHAR(256), meta jsonb default '{}'::jsonb ); diff --git a/backend/database/models/qvyun_v2/public/model/orders.go b/backend/database/models/qvyun_v2/public/model/orders.go index ca9b1d2..c91c163 100644 --- a/backend/database/models/qvyun_v2/public/model/orders.go +++ b/backend/database/models/qvyun_v2/public/model/orders.go @@ -26,6 +26,7 @@ type Orders struct { RemoteRefundSerial string `json:"remote_refund_serial"` Amount int64 `json:"amount"` Currency string `json:"currency"` + Title string `json:"title"` Description *string `json:"description"` Meta *string `json:"meta"` } diff --git a/backend/database/models/qvyun_v2/public/model/user_oauths.go b/backend/database/models/qvyun_v2/public/model/user_oauths.go index d05f3b5..e103b96 100644 --- a/backend/database/models/qvyun_v2/public/model/user_oauths.go +++ b/backend/database/models/qvyun_v2/public/model/user_oauths.go @@ -21,7 +21,6 @@ type UserOauths struct { UserID int64 `json:"user_id"` UnionID *string `json:"union_id"` OpenID string `json:"open_id"` - AccessKey string `json:"access_key"` AccessToken string `json:"access_token"` RefreshToken string `json:"refresh_token"` ExpireAt time.Time `json:"expire_at"` diff --git a/backend/database/models/qvyun_v2/public/table/orders.go b/backend/database/models/qvyun_v2/public/table/orders.go index 634e9bf..5a6e98f 100644 --- a/backend/database/models/qvyun_v2/public/table/orders.go +++ b/backend/database/models/qvyun_v2/public/table/orders.go @@ -31,6 +31,7 @@ type ordersTable struct { RemoteRefundSerial postgres.ColumnString Amount postgres.ColumnInteger Currency postgres.ColumnString + Title postgres.ColumnString Description postgres.ColumnString Meta postgres.ColumnString @@ -87,10 +88,11 @@ func newOrdersTableImpl(schemaName, tableName, alias string) ordersTable { RemoteRefundSerialColumn = postgres.StringColumn("remote_refund_serial") AmountColumn = postgres.IntegerColumn("amount") CurrencyColumn = postgres.StringColumn("currency") + TitleColumn = postgres.StringColumn("title") DescriptionColumn = postgres.StringColumn("description") MetaColumn = postgres.StringColumn("meta") - allColumns = postgres.ColumnList{IDColumn, CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, TenantIDColumn, UserIDColumn, TypeColumn, StatusColumn, OrderSerialColumn, RemoteOrderSerialColumn, RefundSerialColumn, RemoteRefundSerialColumn, AmountColumn, CurrencyColumn, DescriptionColumn, MetaColumn} - mutableColumns = postgres.ColumnList{CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, TenantIDColumn, UserIDColumn, TypeColumn, StatusColumn, OrderSerialColumn, RemoteOrderSerialColumn, RefundSerialColumn, RemoteRefundSerialColumn, AmountColumn, CurrencyColumn, DescriptionColumn, MetaColumn} + allColumns = postgres.ColumnList{IDColumn, CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, TenantIDColumn, UserIDColumn, TypeColumn, StatusColumn, OrderSerialColumn, RemoteOrderSerialColumn, RefundSerialColumn, RemoteRefundSerialColumn, AmountColumn, CurrencyColumn, TitleColumn, DescriptionColumn, MetaColumn} + mutableColumns = postgres.ColumnList{CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, TenantIDColumn, UserIDColumn, TypeColumn, StatusColumn, OrderSerialColumn, RemoteOrderSerialColumn, RefundSerialColumn, RemoteRefundSerialColumn, AmountColumn, CurrencyColumn, TitleColumn, DescriptionColumn, MetaColumn} ) return ordersTable{ @@ -111,6 +113,7 @@ func newOrdersTableImpl(schemaName, tableName, alias string) ordersTable { RemoteRefundSerial: RemoteRefundSerialColumn, Amount: AmountColumn, Currency: CurrencyColumn, + Title: TitleColumn, Description: DescriptionColumn, Meta: MetaColumn, diff --git a/backend/database/models/qvyun_v2/public/table/user_oauths.go b/backend/database/models/qvyun_v2/public/table/user_oauths.go index 76dbc3a..edf341d 100644 --- a/backend/database/models/qvyun_v2/public/table/user_oauths.go +++ b/backend/database/models/qvyun_v2/public/table/user_oauths.go @@ -25,7 +25,6 @@ type userOauthsTable struct { UserID postgres.ColumnInteger UnionID postgres.ColumnString OpenID postgres.ColumnString - AccessKey postgres.ColumnString AccessToken postgres.ColumnString RefreshToken postgres.ColumnString ExpireAt postgres.ColumnTimestamp @@ -78,13 +77,12 @@ func newUserOauthsTableImpl(schemaName, tableName, alias string) userOauthsTable UserIDColumn = postgres.IntegerColumn("user_id") UnionIDColumn = postgres.StringColumn("union_id") OpenIDColumn = postgres.StringColumn("open_id") - AccessKeyColumn = postgres.StringColumn("access_key") AccessTokenColumn = postgres.StringColumn("access_token") RefreshTokenColumn = postgres.StringColumn("refresh_token") ExpireAtColumn = postgres.TimestampColumn("expire_at") MetaColumn = postgres.StringColumn("meta") - allColumns = postgres.ColumnList{IDColumn, CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, ChannelColumn, UserIDColumn, UnionIDColumn, OpenIDColumn, AccessKeyColumn, AccessTokenColumn, RefreshTokenColumn, ExpireAtColumn, MetaColumn} - mutableColumns = postgres.ColumnList{CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, ChannelColumn, UserIDColumn, UnionIDColumn, OpenIDColumn, AccessKeyColumn, AccessTokenColumn, RefreshTokenColumn, ExpireAtColumn, MetaColumn} + allColumns = postgres.ColumnList{IDColumn, CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, ChannelColumn, UserIDColumn, UnionIDColumn, OpenIDColumn, AccessTokenColumn, RefreshTokenColumn, ExpireAtColumn, MetaColumn} + mutableColumns = postgres.ColumnList{CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, ChannelColumn, UserIDColumn, UnionIDColumn, OpenIDColumn, AccessTokenColumn, RefreshTokenColumn, ExpireAtColumn, MetaColumn} ) return userOauthsTable{ @@ -99,7 +97,6 @@ func newUserOauthsTableImpl(schemaName, tableName, alias string) userOauthsTable UserID: UserIDColumn, UnionID: UnionIDColumn, OpenID: OpenIDColumn, - AccessKey: AccessKeyColumn, AccessToken: AccessTokenColumn, RefreshToken: RefreshTokenColumn, ExpireAt: ExpireAtColumn,