rogee/qvyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: order

Browse Source
This commit is contained in:
Rogee
2025-01-10 19:09:27 +08:00
parent 749add1b89
commit f3ae895fec
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/database/migrations/20250109085218_create_tenants.sql
View File

@@ -52,4 +52,5 @@ CREATE TABLE
-- +goose StatementBegin -- +goose StatementBegin
DROP TABLE tenants; DROP TABLE tenants;
DROP TABLE tenant_users; DROP TABLE tenant_users;
DROP TABLE tenant_user_balances;
-- +goose StatementEnd -- +goose StatementEnd

1
backend/database/migrations/20250109094724_create_order.sql
View File

@@ -20,6 +20,7 @@ CREATE TABLE
remote_refund_serial VARCHAR(256) NOT NULL UNIQUE, remote_refund_serial VARCHAR(256) NOT NULL UNIQUE,
amount INT8 NOT NULL default 0, amount INT8 NOT NULL default 0,
currency VARCHAR(32) NOT NULL default 'CNY', currency VARCHAR(32) NOT NULL default 'CNY',
title VARCHAR(128) NOT NULL DEFAULT '',
description VARCHAR(256), description VARCHAR(256),
meta jsonb default '{}'::jsonb meta jsonb default '{}'::jsonb
); );

1
backend/database/models/qvyun_v2/public/model/orders.go
View File

@@ -26,6 +26,7 @@ type Orders struct {
RemoteRefundSerial string `json:"remote_refund_serial"` RemoteRefundSerial string `json:"remote_refund_serial"`
Amount int64 `json:"amount"` Amount int64 `json:"amount"`
Currency string `json:"currency"` Currency string `json:"currency"`
Title string `json:"title"`
Description *string `json:"description"` Description *string `json:"description"`
Meta *string `json:"meta"` Meta *string `json:"meta"`
} }

1
backend/database/models/qvyun_v2/public/model/user_oauths.go
View File

@@ -21,7 +21,6 @@ type UserOauths struct {
UserID int64 `json:"user_id"` UserID int64 `json:"user_id"`
UnionID *string `json:"union_id"` UnionID *string `json:"union_id"`
OpenID string `json:"open_id"` OpenID string `json:"open_id"`
AccessKey string `json:"access_key"`
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
RefreshToken string `json:"refresh_token"` RefreshToken string `json:"refresh_token"`
ExpireAt time.Time `json:"expire_at"` ExpireAt time.Time `json:"expire_at"`

7
backend/database/models/qvyun_v2/public/table/orders.go
View File

@@ -31,6 +31,7 @@ type ordersTable struct {
RemoteRefundSerial postgres.ColumnString RemoteRefundSerial postgres.ColumnString
Amount postgres.ColumnInteger Amount postgres.ColumnInteger
Currency postgres.ColumnString Currency postgres.ColumnString
Title postgres.ColumnString
Description postgres.ColumnString Description postgres.ColumnString
Meta postgres.ColumnString Meta postgres.ColumnString
@@ -87,10 +88,11 @@ func newOrdersTableImpl(schemaName, tableName, alias string) ordersTable {
RemoteRefundSerialColumn = postgres.StringColumn("remote_refund_serial") RemoteRefundSerialColumn = postgres.StringColumn("remote_refund_serial")
AmountColumn = postgres.IntegerColumn("amount") AmountColumn = postgres.IntegerColumn("amount")
CurrencyColumn = postgres.StringColumn("currency") CurrencyColumn = postgres.StringColumn("currency")
TitleColumn = postgres.StringColumn("title")
DescriptionColumn = postgres.StringColumn("description") DescriptionColumn = postgres.StringColumn("description")
MetaColumn = postgres.StringColumn("meta") MetaColumn = postgres.StringColumn("meta")
allColumns = postgres.ColumnList{IDColumn, 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, DescriptionColumn, MetaColumn} mutableColumns = postgres.ColumnList{CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, TenantIDColumn, UserIDColumn, TypeColumn, StatusColumn, OrderSerialColumn, RemoteOrderSerialColumn, RefundSerialColumn, RemoteRefundSerialColumn, AmountColumn, CurrencyColumn, TitleColumn, DescriptionColumn, MetaColumn}
) )
return ordersTable{ return ordersTable{
@@ -111,6 +113,7 @@ func newOrdersTableImpl(schemaName, tableName, alias string) ordersTable {
RemoteRefundSerial: RemoteRefundSerialColumn, RemoteRefundSerial: RemoteRefundSerialColumn,
Amount: AmountColumn, Amount: AmountColumn,
Currency: CurrencyColumn, Currency: CurrencyColumn,
Title: TitleColumn,
Description: DescriptionColumn, Description: DescriptionColumn,
Meta: MetaColumn, Meta: MetaColumn,

7
backend/database/models/qvyun_v2/public/table/user_oauths.go
View File

@@ -25,7 +25,6 @@ type userOauthsTable struct {
UserID postgres.ColumnInteger UserID postgres.ColumnInteger
UnionID postgres.ColumnString UnionID postgres.ColumnString
OpenID postgres.ColumnString OpenID postgres.ColumnString
AccessKey postgres.ColumnString
AccessToken postgres.ColumnString AccessToken postgres.ColumnString
RefreshToken postgres.ColumnString RefreshToken postgres.ColumnString
ExpireAt postgres.ColumnTimestamp ExpireAt postgres.ColumnTimestamp
@@ -78,13 +77,12 @@ func newUserOauthsTableImpl(schemaName, tableName, alias string) userOauthsTable
UserIDColumn = postgres.IntegerColumn("user_id") UserIDColumn = postgres.IntegerColumn("user_id")
UnionIDColumn = postgres.StringColumn("union_id") UnionIDColumn = postgres.StringColumn("union_id")
OpenIDColumn = postgres.StringColumn("open_id") OpenIDColumn = postgres.StringColumn("open_id")
AccessKeyColumn = postgres.StringColumn("access_key")
AccessTokenColumn = postgres.StringColumn("access_token") AccessTokenColumn = postgres.StringColumn("access_token")
RefreshTokenColumn = postgres.StringColumn("refresh_token") RefreshTokenColumn = postgres.StringColumn("refresh_token")
ExpireAtColumn = postgres.TimestampColumn("expire_at") ExpireAtColumn = postgres.TimestampColumn("expire_at")
MetaColumn = postgres.StringColumn("meta") MetaColumn = postgres.StringColumn("meta")
allColumns = postgres.ColumnList{IDColumn, 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, AccessKeyColumn, AccessTokenColumn, RefreshTokenColumn, ExpireAtColumn, MetaColumn} mutableColumns = postgres.ColumnList{CreatedAtColumn, UpdatedAtColumn, DeletedAtColumn, ChannelColumn, UserIDColumn, UnionIDColumn, OpenIDColumn, AccessTokenColumn, RefreshTokenColumn, ExpireAtColumn, MetaColumn}
) )
return userOauthsTable{ return userOauthsTable{
@@ -99,7 +97,6 @@ func newUserOauthsTableImpl(schemaName, tableName, alias string) userOauthsTable
UserID: UserIDColumn, UserID: UserIDColumn,
UnionID: UnionIDColumn, UnionID: UnionIDColumn,
OpenID: OpenIDColumn, OpenID: OpenIDColumn,
AccessKey: AccessKeyColumn,
AccessToken: AccessTokenColumn, AccessToken: AccessTokenColumn,
RefreshToken: RefreshTokenColumn, RefreshToken: RefreshTokenColumn,
ExpireAt: ExpireAtColumn, ExpireAt: ExpireAtColumn,