调整交易和账单模型，完善支付与用户余额基础处理逻辑

web/queries/bill.gen.go

@@ -30,8 +30,6 @@ func newBill(db *gorm.DB, opts ...gen.DOOption) bill {
 	_bill.ID = field.NewInt32(tableName, "id")
 	_bill.UserID = field.NewInt32(tableName, "user_id")
 	_bill.Info = field.NewString(tableName, "info")
-	_bill.Amount = field.NewFloat64(tableName, "amount")
-	_bill.Payment = field.NewFloat64(tableName, "payment")
 	_bill.CreatedAt = field.NewTime(tableName, "created_at")
 	_bill.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_bill.DeletedAt = field.NewField(tableName, "deleted_at")
@@ -39,6 +37,8 @@ func newBill(db *gorm.DB, opts ...gen.DOOption) bill {
 	_bill.ResourceID = field.NewInt32(tableName, "resource_id")
 	_bill.Type = field.NewInt32(tableName, "type")
 	_bill.BillNo = field.NewString(tableName, "bill_no")
+	_bill.RefundID = field.NewInt32(tableName, "refund_id")
+	_bill.Status = field.NewInt32(tableName, "status")
 
 	_bill.fillFieldMap()
 
@@ -49,18 +49,18 @@ type bill struct {
 	billDo
 
 	ALL        field.Asterisk
-	ID         field.Int32   // 账单ID
-	UserID     field.Int32   // 用户ID
-	Info       field.String  // 产品可读信息
-	Amount     field.Float64 // 总金额
-	Payment    field.Float64 // 支付金额
-	CreatedAt  field.Time    // 创建时间
-	UpdatedAt  field.Time    // 更新时间
-	DeletedAt  field.Field   // 删除时间
+	ID         field.Int32  // 账单ID
+	UserID     field.Int32  // 用户ID
+	Info       field.String // 产品可读信息
+	CreatedAt  field.Time   // 创建时间
+	UpdatedAt  field.Time   // 更新时间
+	DeletedAt  field.Field  // 删除时间
 	TradeID    field.Int32
 	ResourceID field.Int32
 	Type       field.Int32
 	BillNo     field.String
+	RefundID   field.Int32
+	Status     field.Int32
 
 	fieldMap map[string]field.Expr
 }
@@ -80,8 +80,6 @@ func (b *bill) updateTableName(table string) *bill {
 	b.ID = field.NewInt32(table, "id")
 	b.UserID = field.NewInt32(table, "user_id")
 	b.Info = field.NewString(table, "info")
-	b.Amount = field.NewFloat64(table, "amount")
-	b.Payment = field.NewFloat64(table, "payment")
 	b.CreatedAt = field.NewTime(table, "created_at")
 	b.UpdatedAt = field.NewTime(table, "updated_at")
 	b.DeletedAt = field.NewField(table, "deleted_at")
@@ -89,6 +87,8 @@ func (b *bill) updateTableName(table string) *bill {
 	b.ResourceID = field.NewInt32(table, "resource_id")
 	b.Type = field.NewInt32(table, "type")
 	b.BillNo = field.NewString(table, "bill_no")
+	b.RefundID = field.NewInt32(table, "refund_id")
+	b.Status = field.NewInt32(table, "status")
 
 	b.fillFieldMap()
 
@@ -109,8 +109,6 @@ func (b *bill) fillFieldMap() {
 	b.fieldMap["id"] = b.ID
 	b.fieldMap["user_id"] = b.UserID
 	b.fieldMap["info"] = b.Info
-	b.fieldMap["amount"] = b.Amount
-	b.fieldMap["payment"] = b.Payment
 	b.fieldMap["created_at"] = b.CreatedAt
 	b.fieldMap["updated_at"] = b.UpdatedAt
 	b.fieldMap["deleted_at"] = b.DeletedAt
@@ -118,6 +116,8 @@ func (b *bill) fillFieldMap() {
 	b.fieldMap["resource_id"] = b.ResourceID
 	b.fieldMap["type"] = b.Type
 	b.fieldMap["bill_no"] = b.BillNo
+	b.fieldMap["refund_id"] = b.RefundID
+	b.fieldMap["status"] = b.Status
 }
 
 func (b bill) clone(db *gorm.DB) bill {

web/queries/trade.gen.go

@@ -40,6 +40,9 @@ func newTrade(db *gorm.DB, opts ...gen.DOOption) trade {
 	_trade.CreatedAt = field.NewTime(tableName, "created_at")
 	_trade.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_trade.DeletedAt = field.NewField(tableName, "deleted_at")
+	_trade.Type = field.NewInt32(tableName, "type")
+	_trade.CancelAt = field.NewTime(tableName, "cancel_at")
+	_trade.PaidAt = field.NewTime(tableName, "paid_at")
 
 	_trade.fillFieldMap()
 
@@ -63,6 +66,9 @@ type trade struct {
 	CreatedAt field.Time    // 创建时间
 	UpdatedAt field.Time    // 更新时间
 	DeletedAt field.Field   // 删除时间
+	Type      field.Int32
+	CancelAt  field.Time
+	PaidAt    field.Time
 
 	fieldMap map[string]field.Expr
 }
@@ -92,6 +98,9 @@ func (t *trade) updateTableName(table string) *trade {
 	t.CreatedAt = field.NewTime(table, "created_at")
 	t.UpdatedAt = field.NewTime(table, "updated_at")
 	t.DeletedAt = field.NewField(table, "deleted_at")
+	t.Type = field.NewInt32(table, "type")
+	t.CancelAt = field.NewTime(table, "cancel_at")
+	t.PaidAt = field.NewTime(table, "paid_at")
 
 	t.fillFieldMap()
 
@@ -108,7 +117,7 @@ func (t *trade) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (t *trade) fillFieldMap() {
-	t.fieldMap = make(map[string]field.Expr, 13)
+	t.fieldMap = make(map[string]field.Expr, 16)
 	t.fieldMap["id"] = t.ID
 	t.fieldMap["user_id"] = t.UserID
 	t.fieldMap["inner_no"] = t.InnerNo
@@ -122,6 +131,9 @@ func (t *trade) fillFieldMap() {
 	t.fieldMap["created_at"] = t.CreatedAt
 	t.fieldMap["updated_at"] = t.UpdatedAt
 	t.fieldMap["deleted_at"] = t.DeletedAt
+	t.fieldMap["type"] = t.Type
+	t.fieldMap["cancel_at"] = t.CancelAt
+	t.fieldMap["paid_at"] = t.PaidAt
 }
 
 func (t trade) clone(db *gorm.DB) trade {