This commit is contained in:
2024-10-16 20:46:46 +08:00
parent fdfdbb5ff6
commit 185b8aef90
14 changed files with 546 additions and 306 deletions

View File

@@ -45,14 +45,15 @@ type (
}
Recharge struct {
Id int64 `db:"id"` // 主键
UserId int64 `db:"user_id"` // 用户ID
TransactionId string `db:"transaction_id"` // 交易ID唯一
OutTradeNo string `db:"out_trade_no"` // 外部订单号,唯一
Amount float64 `db:"amount"` // 充值金额
PaymentMethod int64 `db:"payment_method"` // 充值方式 1-支付宝在线支付, 2-对公转账
CreatedAt time.Time `db:"created_at"` // 创建时间
UpdatedAt time.Time `db:"updated_at"` // 更新时间
Id int64 `db:"id"` // 主键
UserId int64 `db:"user_id"` // 用户ID
TransactionId string `db:"transaction_id"` // 交易ID唯一
OutTradeNo string `db:"out_trade_no"` // 外部订单号,唯一
Amount float64 `db:"amount"` // 充值金额
PaymentMethod int64 `db:"payment_method"` // 充值方式 1-支付宝在线支付, 2-对公转账
Remark sql.NullString `db:"remark"` // 备注
CreatedAt time.Time `db:"created_at"` // 创建时间
UpdatedAt time.Time `db:"updated_at"` // 更新时间
}
)
@@ -141,8 +142,8 @@ func (m *defaultRechargeModel) Insert(ctx context.Context, data *Recharge) (sql.
rechargeOutTradeNoKey := fmt.Sprintf("%s%v", cacheRechargeOutTradeNoPrefix, data.OutTradeNo)
rechargeTransactionIdKey := fmt.Sprintf("%s%v", cacheRechargeTransactionIdPrefix, data.TransactionId)
ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, rechargeRowsExpectAutoSet)
return conn.ExecCtx(ctx, query, data.UserId, data.TransactionId, data.OutTradeNo, data.Amount, data.PaymentMethod)
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, rechargeRowsExpectAutoSet)
return conn.ExecCtx(ctx, query, data.UserId, data.TransactionId, data.OutTradeNo, data.Amount, data.PaymentMethod, data.Remark)
}, rechargeIdKey, rechargeOutTradeNoKey, rechargeTransactionIdKey)
return ret, err
}
@@ -158,7 +159,7 @@ func (m *defaultRechargeModel) Update(ctx context.Context, newData *Recharge) er
rechargeTransactionIdKey := fmt.Sprintf("%s%v", cacheRechargeTransactionIdPrefix, data.TransactionId)
_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, rechargeRowsWithPlaceHolder)
return conn.ExecCtx(ctx, query, newData.UserId, newData.TransactionId, newData.OutTradeNo, newData.Amount, newData.PaymentMethod, newData.Id)
return conn.ExecCtx(ctx, query, newData.UserId, newData.TransactionId, newData.OutTradeNo, newData.Amount, newData.PaymentMethod, newData.Remark, newData.Id)
}, rechargeIdKey, rechargeOutTradeNoKey, rechargeTransactionIdKey)
return err
}