优化表结构,重构模型,重新实现基于白银网关的提取节点流程
This commit is contained in:
@@ -28,25 +28,25 @@ func newTrade(db *gorm.DB, opts ...gen.DOOption) trade {
|
||||
tableName := _trade.tradeDo.TableName()
|
||||
_trade.ALL = field.NewAsterisk(tableName)
|
||||
_trade.ID = field.NewInt32(tableName, "id")
|
||||
_trade.CreatedAt = field.NewTime(tableName, "created_at")
|
||||
_trade.UpdatedAt = field.NewTime(tableName, "updated_at")
|
||||
_trade.DeletedAt = field.NewField(tableName, "deleted_at")
|
||||
_trade.UserID = field.NewInt32(tableName, "user_id")
|
||||
_trade.InnerNo = field.NewString(tableName, "inner_no")
|
||||
_trade.OuterNo = field.NewString(tableName, "outer_no")
|
||||
_trade.Type = field.NewInt32(tableName, "type")
|
||||
_trade.Type = field.NewInt(tableName, "type")
|
||||
_trade.Subject = field.NewString(tableName, "subject")
|
||||
_trade.Remark = field.NewString(tableName, "remark")
|
||||
_trade.Amount = field.NewField(tableName, "amount")
|
||||
_trade.Payment = field.NewField(tableName, "payment")
|
||||
_trade.Method = field.NewInt32(tableName, "method")
|
||||
_trade.Platform = field.NewInt32(tableName, "platform")
|
||||
_trade.Acquirer = field.NewInt32(tableName, "acquirer")
|
||||
_trade.Status = field.NewInt32(tableName, "status")
|
||||
_trade.Method = field.NewInt(tableName, "method")
|
||||
_trade.Platform = field.NewInt(tableName, "platform")
|
||||
_trade.Acquirer = field.NewInt(tableName, "acquirer")
|
||||
_trade.Status = field.NewInt(tableName, "status")
|
||||
_trade.Refunded = field.NewBool(tableName, "refunded")
|
||||
_trade.PaymentURL = field.NewString(tableName, "payment_url")
|
||||
_trade.CompletedAt = field.NewField(tableName, "completed_at")
|
||||
_trade.CanceledAt = field.NewField(tableName, "canceled_at")
|
||||
_trade.CreatedAt = field.NewField(tableName, "created_at")
|
||||
_trade.UpdatedAt = field.NewField(tableName, "updated_at")
|
||||
_trade.DeletedAt = field.NewField(tableName, "deleted_at")
|
||||
_trade.CompletedAt = field.NewTime(tableName, "completed_at")
|
||||
_trade.CanceledAt = field.NewTime(tableName, "canceled_at")
|
||||
|
||||
_trade.fillFieldMap()
|
||||
|
||||
@@ -57,26 +57,26 @@ type trade struct {
|
||||
tradeDo
|
||||
|
||||
ALL field.Asterisk
|
||||
ID field.Int32 // 订单ID
|
||||
UserID field.Int32 // 用户ID
|
||||
InnerNo field.String // 内部订单号
|
||||
OuterNo field.String // 外部订单号
|
||||
Type field.Int32 // 订单类型:1-购买产品,2-充值余额
|
||||
Subject field.String // 订单主题
|
||||
Remark field.String // 订单备注
|
||||
Amount field.Field // 订单总金额
|
||||
Payment field.Field // 实际支付金额
|
||||
Method field.Int32 // 支付方式:1-支付宝,2-微信,3-商福通,4-商福通渠道支付宝,5-商福通渠道微信
|
||||
Platform field.Int32 // 支付平台:1-电脑网站,2-手机网站
|
||||
Acquirer field.Int32 // 收单机构:1-支付宝,2-微信,3-银联
|
||||
Status field.Int32 // 订单状态:0-待支付,1-已支付,2-已取消
|
||||
ID field.Int32
|
||||
CreatedAt field.Time
|
||||
UpdatedAt field.Time
|
||||
DeletedAt field.Field
|
||||
UserID field.Int32
|
||||
InnerNo field.String
|
||||
OuterNo field.String
|
||||
Type field.Int
|
||||
Subject field.String
|
||||
Remark field.String
|
||||
Amount field.Field
|
||||
Payment field.Field
|
||||
Method field.Int
|
||||
Platform field.Int
|
||||
Acquirer field.Int
|
||||
Status field.Int
|
||||
Refunded field.Bool
|
||||
PaymentURL field.String // 支付链接
|
||||
CompletedAt field.Field // 支付时间
|
||||
CanceledAt field.Field // 取消时间
|
||||
CreatedAt field.Field // 创建时间
|
||||
UpdatedAt field.Field // 更新时间
|
||||
DeletedAt field.Field // 删除时间
|
||||
PaymentURL field.String
|
||||
CompletedAt field.Time
|
||||
CanceledAt field.Time
|
||||
|
||||
fieldMap map[string]field.Expr
|
||||
}
|
||||
@@ -94,25 +94,25 @@ func (t trade) As(alias string) *trade {
|
||||
func (t *trade) updateTableName(table string) *trade {
|
||||
t.ALL = field.NewAsterisk(table)
|
||||
t.ID = field.NewInt32(table, "id")
|
||||
t.CreatedAt = field.NewTime(table, "created_at")
|
||||
t.UpdatedAt = field.NewTime(table, "updated_at")
|
||||
t.DeletedAt = field.NewField(table, "deleted_at")
|
||||
t.UserID = field.NewInt32(table, "user_id")
|
||||
t.InnerNo = field.NewString(table, "inner_no")
|
||||
t.OuterNo = field.NewString(table, "outer_no")
|
||||
t.Type = field.NewInt32(table, "type")
|
||||
t.Type = field.NewInt(table, "type")
|
||||
t.Subject = field.NewString(table, "subject")
|
||||
t.Remark = field.NewString(table, "remark")
|
||||
t.Amount = field.NewField(table, "amount")
|
||||
t.Payment = field.NewField(table, "payment")
|
||||
t.Method = field.NewInt32(table, "method")
|
||||
t.Platform = field.NewInt32(table, "platform")
|
||||
t.Acquirer = field.NewInt32(table, "acquirer")
|
||||
t.Status = field.NewInt32(table, "status")
|
||||
t.Method = field.NewInt(table, "method")
|
||||
t.Platform = field.NewInt(table, "platform")
|
||||
t.Acquirer = field.NewInt(table, "acquirer")
|
||||
t.Status = field.NewInt(table, "status")
|
||||
t.Refunded = field.NewBool(table, "refunded")
|
||||
t.PaymentURL = field.NewString(table, "payment_url")
|
||||
t.CompletedAt = field.NewField(table, "completed_at")
|
||||
t.CanceledAt = field.NewField(table, "canceled_at")
|
||||
t.CreatedAt = field.NewField(table, "created_at")
|
||||
t.UpdatedAt = field.NewField(table, "updated_at")
|
||||
t.DeletedAt = field.NewField(table, "deleted_at")
|
||||
t.CompletedAt = field.NewTime(table, "completed_at")
|
||||
t.CanceledAt = field.NewTime(table, "canceled_at")
|
||||
|
||||
t.fillFieldMap()
|
||||
|
||||
@@ -131,6 +131,9 @@ func (t *trade) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
|
||||
func (t *trade) fillFieldMap() {
|
||||
t.fieldMap = make(map[string]field.Expr, 20)
|
||||
t.fieldMap["id"] = t.ID
|
||||
t.fieldMap["created_at"] = t.CreatedAt
|
||||
t.fieldMap["updated_at"] = t.UpdatedAt
|
||||
t.fieldMap["deleted_at"] = t.DeletedAt
|
||||
t.fieldMap["user_id"] = t.UserID
|
||||
t.fieldMap["inner_no"] = t.InnerNo
|
||||
t.fieldMap["outer_no"] = t.OuterNo
|
||||
@@ -147,9 +150,6 @@ func (t *trade) fillFieldMap() {
|
||||
t.fieldMap["payment_url"] = t.PaymentURL
|
||||
t.fieldMap["completed_at"] = t.CompletedAt
|
||||
t.fieldMap["canceled_at"] = t.CanceledAt
|
||||
t.fieldMap["created_at"] = t.CreatedAt
|
||||
t.fieldMap["updated_at"] = t.UpdatedAt
|
||||
t.fieldMap["deleted_at"] = t.DeletedAt
|
||||
}
|
||||
|
||||
func (t trade) clone(db *gorm.DB) trade {
|
||||
|
||||
Reference in New Issue
Block a user