new
This commit is contained in:
@@ -39,6 +39,11 @@ type (
|
||||
LoginReq = user.LoginReq
|
||||
LoginResp = user.LoginResp
|
||||
PhoneLoginReq = user.PhoneLoginReq
|
||||
RechargeItem = user.RechargeItem
|
||||
RechargeRequest = user.RechargeRequest
|
||||
RechargeResponse = user.RechargeResponse
|
||||
RechargeWalletRequest = user.RechargeWalletRequest
|
||||
RechargeWalletResponse = user.RechargeWalletResponse
|
||||
RegisterReq = user.RegisterReq
|
||||
ReviewEnterpriseReq = user.ReviewEnterpriseReq
|
||||
UpdateWalletRequest = user.UpdateWalletRequest
|
||||
|
||||
@@ -39,6 +39,11 @@ type (
|
||||
LoginReq = user.LoginReq
|
||||
LoginResp = user.LoginResp
|
||||
PhoneLoginReq = user.PhoneLoginReq
|
||||
RechargeItem = user.RechargeItem
|
||||
RechargeRequest = user.RechargeRequest
|
||||
RechargeResponse = user.RechargeResponse
|
||||
RechargeWalletRequest = user.RechargeWalletRequest
|
||||
RechargeWalletResponse = user.RechargeWalletResponse
|
||||
RegisterReq = user.RegisterReq
|
||||
ReviewEnterpriseReq = user.ReviewEnterpriseReq
|
||||
UpdateWalletRequest = user.UpdateWalletRequest
|
||||
|
||||
@@ -39,6 +39,11 @@ type (
|
||||
LoginReq = user.LoginReq
|
||||
LoginResp = user.LoginResp
|
||||
PhoneLoginReq = user.PhoneLoginReq
|
||||
RechargeItem = user.RechargeItem
|
||||
RechargeRequest = user.RechargeRequest
|
||||
RechargeResponse = user.RechargeResponse
|
||||
RechargeWalletRequest = user.RechargeWalletRequest
|
||||
RechargeWalletResponse = user.RechargeWalletResponse
|
||||
RegisterReq = user.RegisterReq
|
||||
ReviewEnterpriseReq = user.ReviewEnterpriseReq
|
||||
UpdateWalletRequest = user.UpdateWalletRequest
|
||||
|
||||
@@ -39,6 +39,11 @@ type (
|
||||
LoginReq = user.LoginReq
|
||||
LoginResp = user.LoginResp
|
||||
PhoneLoginReq = user.PhoneLoginReq
|
||||
RechargeItem = user.RechargeItem
|
||||
RechargeRequest = user.RechargeRequest
|
||||
RechargeResponse = user.RechargeResponse
|
||||
RechargeWalletRequest = user.RechargeWalletRequest
|
||||
RechargeWalletResponse = user.RechargeWalletResponse
|
||||
RegisterReq = user.RegisterReq
|
||||
ReviewEnterpriseReq = user.ReviewEnterpriseReq
|
||||
UpdateWalletRequest = user.UpdateWalletRequest
|
||||
|
||||
@@ -39,6 +39,11 @@ type (
|
||||
LoginReq = user.LoginReq
|
||||
LoginResp = user.LoginResp
|
||||
PhoneLoginReq = user.PhoneLoginReq
|
||||
RechargeItem = user.RechargeItem
|
||||
RechargeRequest = user.RechargeRequest
|
||||
RechargeResponse = user.RechargeResponse
|
||||
RechargeWalletRequest = user.RechargeWalletRequest
|
||||
RechargeWalletResponse = user.RechargeWalletResponse
|
||||
RegisterReq = user.RegisterReq
|
||||
ReviewEnterpriseReq = user.ReviewEnterpriseReq
|
||||
UpdateWalletRequest = user.UpdateWalletRequest
|
||||
@@ -54,6 +59,10 @@ type (
|
||||
// 查询扣款记录
|
||||
GetDeductions(ctx context.Context, in *GetDeductionsRequest, opts ...grpc.CallOption) (*GetDeductionsResponse, error)
|
||||
GetDeductionByTransactionId(ctx context.Context, in *GetDeductionByTransactionIdRequest, opts ...grpc.CallOption) (*GetDeductionByTransactionIdResponse, error)
|
||||
// 定义充值请求接口
|
||||
RechargeWallet(ctx context.Context, in *RechargeWalletRequest, opts ...grpc.CallOption) (*RechargeWalletResponse, error)
|
||||
// 充值记录列表篇
|
||||
GetRechargeList(ctx context.Context, in *RechargeRequest, opts ...grpc.CallOption) (*RechargeResponse, error)
|
||||
}
|
||||
|
||||
defaultWalletService struct {
|
||||
@@ -89,3 +98,15 @@ func (m *defaultWalletService) GetDeductionByTransactionId(ctx context.Context,
|
||||
client := user.NewWalletServiceClient(m.cli.Conn())
|
||||
return client.GetDeductionByTransactionId(ctx, in, opts...)
|
||||
}
|
||||
|
||||
// 定义充值请求接口
|
||||
func (m *defaultWalletService) RechargeWallet(ctx context.Context, in *RechargeWalletRequest, opts ...grpc.CallOption) (*RechargeWalletResponse, error) {
|
||||
client := user.NewWalletServiceClient(m.cli.Conn())
|
||||
return client.RechargeWallet(ctx, in, opts...)
|
||||
}
|
||||
|
||||
// 充值记录列表篇
|
||||
func (m *defaultWalletService) GetRechargeList(ctx context.Context, in *RechargeRequest, opts ...grpc.CallOption) (*RechargeResponse, error) {
|
||||
client := user.NewWalletServiceClient(m.cli.Conn())
|
||||
return client.GetRechargeList(ctx, in, opts...)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
package walletservicelogic
|
||||
|
||||
import (
|
||||
"context"
|
||||
"tianyuan-api/apps/user/internal/svc"
|
||||
"tianyuan-api/apps/user/user"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type GetRechargeListLogic struct {
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
logx.Logger
|
||||
}
|
||||
|
||||
func NewGetRechargeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRechargeListLogic {
|
||||
return &GetRechargeListLogic{
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
Logger: logx.WithContext(ctx),
|
||||
}
|
||||
}
|
||||
|
||||
// 充值记录列表篇
|
||||
func (l *GetRechargeListLogic) GetRechargeList(in *user.RechargeRequest) (*user.RechargeResponse, error) {
|
||||
list, total, err := l.svcCtx.RechargeModel.FindRechargeListByUserId(l.ctx, in.UserId, in.Page, in.PageSize)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var rechargeItemList []*user.RechargeItem
|
||||
for _, w := range list {
|
||||
rechargeItemList = append(rechargeItemList, &user.RechargeItem{
|
||||
Id: w.Id,
|
||||
UserId: w.UserId,
|
||||
TransactionId: w.TransactionId,
|
||||
OutTradeNo: w.OutTradeNo,
|
||||
Amount: float32(w.Amount),
|
||||
PaymentMethod: w.PaymentMethod,
|
||||
CreatedAt: w.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
UpdatedAt: w.UpdatedAt.Format("2006-01-02 15:04:05"),
|
||||
})
|
||||
}
|
||||
return &user.RechargeResponse{
|
||||
List: rechargeItemList,
|
||||
Total: total,
|
||||
}, nil
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package walletservicelogic
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
"tianyuan-api/apps/user/internal/model"
|
||||
"tianyuan-api/pkg/generate"
|
||||
"time"
|
||||
|
||||
"tianyuan-api/apps/user/internal/svc"
|
||||
"tianyuan-api/apps/user/user"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type RechargeWalletLogic struct {
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
logx.Logger
|
||||
}
|
||||
|
||||
func NewRechargeWalletLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RechargeWalletLogic {
|
||||
return &RechargeWalletLogic{
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
Logger: logx.WithContext(ctx),
|
||||
}
|
||||
}
|
||||
|
||||
// 定义充值请求接口
|
||||
func (l *RechargeWalletLogic) RechargeWallet(in *user.RechargeWalletRequest) (*user.RechargeWalletResponse, error) {
|
||||
if in.Amount <= 0 {
|
||||
return nil, errors.New("金额不能小于0")
|
||||
}
|
||||
// 启动事务
|
||||
err := l.svcCtx.WalletsModel.TransCtx(l.ctx, func(ctx context.Context, session sqlx.Session) error {
|
||||
var err error
|
||||
// 更新余额(充值金额是正数,增加余额)
|
||||
for i := 0; i < maxRetries; i++ {
|
||||
err = l.svcCtx.WalletsModel.UpdateBalance(session, l.ctx, in.UserId, float64(in.Amount))
|
||||
if err == nil {
|
||||
// 成功,退出循环
|
||||
break
|
||||
}
|
||||
if errors.Is(err, model.ErrVersionMismatch) {
|
||||
// 版本号不匹配,重试
|
||||
time.Sleep(100 * time.Millisecond) // 重试前的延迟
|
||||
continue
|
||||
} else {
|
||||
// 其他错误,直接返回
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// 生成交易单号
|
||||
TransactionId := generate.GenerateTransactionID()
|
||||
// 更新余额成功后,插入充值记录
|
||||
_, err = l.svcCtx.RechargeModel.InsertRechargeTrans(ctx, &model.Recharge{
|
||||
TransactionId: TransactionId,
|
||||
OutTradeNo: in.OutTradeNo,
|
||||
UserId: in.UserId,
|
||||
Amount: float64(in.Amount),
|
||||
}, session)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 返回成功的充值响应
|
||||
return &user.RechargeWalletResponse{}, nil
|
||||
}
|
||||
74
apps/user/internal/model/rechargemodel.go
Normal file
74
apps/user/internal/model/rechargemodel.go
Normal file
@@ -0,0 +1,74 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"github.com/zeromicro/go-zero/core/stores/cache"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
)
|
||||
|
||||
var _ RechargeModel = (*customRechargeModel)(nil)
|
||||
|
||||
type (
|
||||
// RechargeModel is an interface to be customized, add more methods here,
|
||||
// and implement the added methods in customRechargeModel.
|
||||
RechargeModel interface {
|
||||
rechargeModel
|
||||
InsertRechargeTrans(ctx context.Context, data *Recharge, session sqlx.Session) (sql.Result, error)
|
||||
FindRechargeListByUserId(ctx context.Context, userId, page, pageSize int64) ([]*Recharge, int64, error)
|
||||
}
|
||||
|
||||
customRechargeModel struct {
|
||||
*defaultRechargeModel
|
||||
}
|
||||
)
|
||||
|
||||
// NewRechargeModel returns a model for the database table.
|
||||
func NewRechargeModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) RechargeModel {
|
||||
return &customRechargeModel{
|
||||
defaultRechargeModel: newRechargeModel(conn, c, opts...),
|
||||
}
|
||||
}
|
||||
func (m *customRechargeModel) InsertRechargeTrans(ctx context.Context, data *Recharge, session sqlx.Session) (sql.Result, error) {
|
||||
rechargeOutTradeNoKey := fmt.Sprintf("%s%v", cacheRechargeOutTradeNoPrefix, data.OutTradeNo)
|
||||
rechargeTransactionIdKey := fmt.Sprintf("%s%v", cacheRechargeTransactionIdPrefix, data.TransactionId)
|
||||
query := fmt.Sprintf("INSERT INTO %s (%s) VALUES (?, ?, ?, ?, ?)", m.table, rechargeRowsExpectAutoSet)
|
||||
ret, err := session.ExecCtx(ctx, query, data.UserId, data.TransactionId, data.OutTradeNo, data.Amount, data.PaymentMethod)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// 2. 更新缓存,保证所有缓存操作成功
|
||||
cacheKeys := []string{rechargeOutTradeNoKey, rechargeTransactionIdKey}
|
||||
cacheErrors := make([]error, len(cacheKeys))
|
||||
|
||||
cacheErrors[0] = m.DelCacheCtx(ctx, rechargeOutTradeNoKey)
|
||||
cacheErrors[1] = m.DelCacheCtx(ctx, rechargeTransactionIdKey)
|
||||
// 3. 检查缓存操作是否全部成功
|
||||
for _, cacheErr := range cacheErrors {
|
||||
if cacheErr != nil {
|
||||
return nil, cacheErr // 返回第一个缓存更新失败的错误
|
||||
}
|
||||
}
|
||||
return ret, err
|
||||
}
|
||||
func (m *customRechargeModel) FindRechargeListByUserId(ctx context.Context, userId, page, pageSize int64) ([]*Recharge, int64, error) {
|
||||
offset := (page - 1) * pageSize
|
||||
query := fmt.Sprintf("SELECT * FROM recharge WHERE user_id = ? ORDER BY created_at DESC LIMIT ? OFFSET ?")
|
||||
|
||||
var recharges []*Recharge
|
||||
err := m.QueryRowsNoCacheCtx(ctx, &recharges, query, userId, pageSize, offset)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
// 获取总记录数
|
||||
var total int64
|
||||
countQuery := "SELECT COUNT(1) FROM recharge WHERE user_id = ?"
|
||||
err = m.QueryRowNoCacheCtx(ctx, &total, countQuery, userId)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
return recharges, total, nil
|
||||
}
|
||||
177
apps/user/internal/model/rechargemodel_gen.go
Normal file
177
apps/user/internal/model/rechargemodel_gen.go
Normal file
@@ -0,0 +1,177 @@
|
||||
// Code generated by goctl. DO NOT EDIT.
|
||||
// versions:
|
||||
// goctl version: 1.7.2
|
||||
|
||||
package model
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/stores/builder"
|
||||
"github.com/zeromicro/go-zero/core/stores/cache"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlc"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
"github.com/zeromicro/go-zero/core/stringx"
|
||||
)
|
||||
|
||||
var (
|
||||
rechargeFieldNames = builder.RawFieldNames(&Recharge{})
|
||||
rechargeRows = strings.Join(rechargeFieldNames, ",")
|
||||
rechargeRowsExpectAutoSet = strings.Join(stringx.Remove(rechargeFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",")
|
||||
rechargeRowsWithPlaceHolder = strings.Join(stringx.Remove(rechargeFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?"
|
||||
|
||||
cacheRechargeIdPrefix = "cache:recharge:id:"
|
||||
cacheRechargeOutTradeNoPrefix = "cache:recharge:outTradeNo:"
|
||||
cacheRechargeTransactionIdPrefix = "cache:recharge:transactionId:"
|
||||
)
|
||||
|
||||
type (
|
||||
rechargeModel interface {
|
||||
Insert(ctx context.Context, data *Recharge) (sql.Result, error)
|
||||
FindOne(ctx context.Context, id int64) (*Recharge, error)
|
||||
FindOneByOutTradeNo(ctx context.Context, outTradeNo string) (*Recharge, error)
|
||||
FindOneByTransactionId(ctx context.Context, transactionId string) (*Recharge, error)
|
||||
Update(ctx context.Context, data *Recharge) error
|
||||
Delete(ctx context.Context, id int64) error
|
||||
}
|
||||
|
||||
defaultRechargeModel struct {
|
||||
sqlc.CachedConn
|
||||
table string
|
||||
}
|
||||
|
||||
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"` // 更新时间
|
||||
}
|
||||
)
|
||||
|
||||
func newRechargeModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultRechargeModel {
|
||||
return &defaultRechargeModel{
|
||||
CachedConn: sqlc.NewConn(conn, c, opts...),
|
||||
table: "`recharge`",
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) Delete(ctx context.Context, id int64) error {
|
||||
data, err := m.FindOne(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rechargeIdKey := fmt.Sprintf("%s%v", cacheRechargeIdPrefix, id)
|
||||
rechargeOutTradeNoKey := fmt.Sprintf("%s%v", cacheRechargeOutTradeNoPrefix, data.OutTradeNo)
|
||||
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("delete from %s where `id` = ?", m.table)
|
||||
return conn.ExecCtx(ctx, query, id)
|
||||
}, rechargeIdKey, rechargeOutTradeNoKey, rechargeTransactionIdKey)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) FindOne(ctx context.Context, id int64) (*Recharge, error) {
|
||||
rechargeIdKey := fmt.Sprintf("%s%v", cacheRechargeIdPrefix, id)
|
||||
var resp Recharge
|
||||
err := m.QueryRowCtx(ctx, &resp, rechargeIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", rechargeRows, m.table)
|
||||
return conn.QueryRowCtx(ctx, v, query, id)
|
||||
})
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) FindOneByOutTradeNo(ctx context.Context, outTradeNo string) (*Recharge, error) {
|
||||
rechargeOutTradeNoKey := fmt.Sprintf("%s%v", cacheRechargeOutTradeNoPrefix, outTradeNo)
|
||||
var resp Recharge
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, rechargeOutTradeNoKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) {
|
||||
query := fmt.Sprintf("select %s from %s where `out_trade_no` = ? limit 1", rechargeRows, m.table)
|
||||
if err := conn.QueryRowCtx(ctx, &resp, query, outTradeNo); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resp.Id, nil
|
||||
}, m.queryPrimary)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) FindOneByTransactionId(ctx context.Context, transactionId string) (*Recharge, error) {
|
||||
rechargeTransactionIdKey := fmt.Sprintf("%s%v", cacheRechargeTransactionIdPrefix, transactionId)
|
||||
var resp Recharge
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, rechargeTransactionIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) {
|
||||
query := fmt.Sprintf("select %s from %s where `transaction_id` = ? limit 1", rechargeRows, m.table)
|
||||
if err := conn.QueryRowCtx(ctx, &resp, query, transactionId); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resp.Id, nil
|
||||
}, m.queryPrimary)
|
||||
switch err {
|
||||
case nil:
|
||||
return &resp, nil
|
||||
case sqlc.ErrNotFound:
|
||||
return nil, ErrNotFound
|
||||
default:
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) Insert(ctx context.Context, data *Recharge) (sql.Result, error) {
|
||||
rechargeIdKey := fmt.Sprintf("%s%v", cacheRechargeIdPrefix, data.Id)
|
||||
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)
|
||||
}, rechargeIdKey, rechargeOutTradeNoKey, rechargeTransactionIdKey)
|
||||
return ret, err
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) Update(ctx context.Context, newData *Recharge) error {
|
||||
data, err := m.FindOne(ctx, newData.Id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rechargeIdKey := fmt.Sprintf("%s%v", cacheRechargeIdPrefix, data.Id)
|
||||
rechargeOutTradeNoKey := fmt.Sprintf("%s%v", cacheRechargeOutTradeNoPrefix, data.OutTradeNo)
|
||||
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)
|
||||
}, rechargeIdKey, rechargeOutTradeNoKey, rechargeTransactionIdKey)
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) formatPrimary(primary any) string {
|
||||
return fmt.Sprintf("%s%v", cacheRechargeIdPrefix, primary)
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error {
|
||||
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", rechargeRows, m.table)
|
||||
return conn.QueryRowCtx(ctx, v, query, primary)
|
||||
}
|
||||
|
||||
func (m *defaultRechargeModel) tableName() string {
|
||||
return m.table
|
||||
}
|
||||
@@ -45,3 +45,15 @@ func (s *WalletServiceServer) GetDeductionByTransactionId(ctx context.Context, i
|
||||
l := walletservicelogic.NewGetDeductionByTransactionIdLogic(ctx, s.svcCtx)
|
||||
return l.GetDeductionByTransactionId(in)
|
||||
}
|
||||
|
||||
// 定义充值请求接口
|
||||
func (s *WalletServiceServer) RechargeWallet(ctx context.Context, in *user.RechargeWalletRequest) (*user.RechargeWalletResponse, error) {
|
||||
l := walletservicelogic.NewRechargeWalletLogic(ctx, s.svcCtx)
|
||||
return l.RechargeWallet(in)
|
||||
}
|
||||
|
||||
// 充值记录列表篇
|
||||
func (s *WalletServiceServer) GetRechargeList(ctx context.Context, in *user.RechargeRequest) (*user.RechargeResponse, error) {
|
||||
l := walletservicelogic.NewGetRechargeListLogic(ctx, s.svcCtx)
|
||||
return l.GetRechargeList(in)
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ type ServiceContext struct {
|
||||
WalletsModel model.WalletsModel
|
||||
DeductionsModel model.DeductionsModel
|
||||
ApiRequestsModel model.ApiRequestsModel
|
||||
RechargeModel model.RechargeModel
|
||||
SecretRpc sentinel.SecretClient
|
||||
ProductRpc sentinel.ProductClient
|
||||
}
|
||||
@@ -41,6 +42,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
WalletsModel: model.NewWalletsModel(db, c.CacheRedis),
|
||||
DeductionsModel: model.NewDeductionsModel(db, c.CacheRedis),
|
||||
ApiRequestsModel: model.NewApiRequestsModel(db, c.CacheRedis),
|
||||
RechargeModel: model.NewRechargeModel(db, c.CacheRedis),
|
||||
SecretRpc: sentinel.NewSecretClient(zrpc.MustNewClient(c.SentinelRpc).Conn()),
|
||||
ProductRpc: sentinel.NewProductClient(zrpc.MustNewClient(c.SentinelRpc).Conn()),
|
||||
}
|
||||
|
||||
@@ -139,8 +139,6 @@ service User {
|
||||
|
||||
// 定义钱包服务
|
||||
service WalletService {
|
||||
|
||||
|
||||
// 修改钱包余额
|
||||
rpc UpdateWallet (UpdateWalletRequest) returns (UpdateWalletResponse);
|
||||
|
||||
@@ -151,6 +149,12 @@ service WalletService {
|
||||
rpc GetDeductions (GetDeductionsRequest) returns (GetDeductionsResponse);
|
||||
|
||||
rpc GetDeductionByTransactionId (GetDeductionByTransactionIdRequest) returns (GetDeductionByTransactionIdResponse);
|
||||
|
||||
// 定义充值请求接口
|
||||
rpc RechargeWallet (RechargeWalletRequest) returns (RechargeWalletResponse);
|
||||
|
||||
// 充值记录列表篇
|
||||
rpc GetRechargeList(RechargeRequest) returns (RechargeResponse);
|
||||
}
|
||||
|
||||
// 更新钱包余额
|
||||
@@ -206,6 +210,37 @@ message Deduction {
|
||||
string created_at = 5;
|
||||
}
|
||||
|
||||
message RechargeWalletRequest {
|
||||
int64 user_id = 1; // 用户ID
|
||||
string out_trade_no = 2; // 订单号
|
||||
int64 amount = 3; // 充值金额
|
||||
int64 payment_method = 4; // 充值方式(1-支付宝在线支付, 2-对公转账)
|
||||
}
|
||||
|
||||
message RechargeWalletResponse {
|
||||
|
||||
}
|
||||
message RechargeRequest {
|
||||
int64 user_id = 1; // 用户ID
|
||||
int64 page = 2; // 分页页码
|
||||
int64 page_size = 3; // 每页大小
|
||||
}
|
||||
|
||||
message RechargeResponse {
|
||||
repeated RechargeItem list = 1; // 充值记录列表
|
||||
int64 total = 2; // 总记录数
|
||||
}
|
||||
|
||||
message RechargeItem {
|
||||
int64 id = 1; // 主键ID
|
||||
int64 user_id = 2; // 用户ID
|
||||
string transaction_id = 3; // 交易ID
|
||||
string out_trade_no = 4; // 外部订单号
|
||||
float amount = 5; // 充值金额
|
||||
int64 payment_method = 6; // 支付方式
|
||||
string created_at = 7; // 创建时间
|
||||
string updated_at = 8; // 更新时间
|
||||
}
|
||||
|
||||
service ApiRequestService {
|
||||
// 添加API请求记录
|
||||
|
||||
@@ -70,3 +70,15 @@ CREATE TABLE api_requests (
|
||||
timestamp DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '请求时间',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='API请求记录表,存储API请求的相关信息';
|
||||
|
||||
CREATE TABLE `recharge` (
|
||||
id INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||
user_id INT(11) NOT NULL COMMENT '用户ID',
|
||||
`transaction_id` VARCHAR(64) NOT NULL UNIQUE COMMENT '交易ID,唯一',
|
||||
`out_trade_no` VARCHAR(64) NOT NULL UNIQUE COMMENT '外部订单号,唯一',
|
||||
`amount` DECIMAL(10, 2) NOT NULL COMMENT '充值金额',
|
||||
`payment_method` TINYINT NOT NULL COMMENT '充值方式 1-支付宝在线支付, 2-对公转账',
|
||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='充值记录表';
|
||||
File diff suppressed because it is too large
Load Diff
@@ -546,6 +546,8 @@ const (
|
||||
WalletService_GetWallet_FullMethodName = "/WalletService/GetWallet"
|
||||
WalletService_GetDeductions_FullMethodName = "/WalletService/GetDeductions"
|
||||
WalletService_GetDeductionByTransactionId_FullMethodName = "/WalletService/GetDeductionByTransactionId"
|
||||
WalletService_RechargeWallet_FullMethodName = "/WalletService/RechargeWallet"
|
||||
WalletService_GetRechargeList_FullMethodName = "/WalletService/GetRechargeList"
|
||||
)
|
||||
|
||||
// WalletServiceClient is the client API for WalletService service.
|
||||
@@ -561,6 +563,10 @@ type WalletServiceClient interface {
|
||||
// 查询扣款记录
|
||||
GetDeductions(ctx context.Context, in *GetDeductionsRequest, opts ...grpc.CallOption) (*GetDeductionsResponse, error)
|
||||
GetDeductionByTransactionId(ctx context.Context, in *GetDeductionByTransactionIdRequest, opts ...grpc.CallOption) (*GetDeductionByTransactionIdResponse, error)
|
||||
// 定义充值请求接口
|
||||
RechargeWallet(ctx context.Context, in *RechargeWalletRequest, opts ...grpc.CallOption) (*RechargeWalletResponse, error)
|
||||
// 充值记录列表篇
|
||||
GetRechargeList(ctx context.Context, in *RechargeRequest, opts ...grpc.CallOption) (*RechargeResponse, error)
|
||||
}
|
||||
|
||||
type walletServiceClient struct {
|
||||
@@ -611,6 +617,26 @@ func (c *walletServiceClient) GetDeductionByTransactionId(ctx context.Context, i
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *walletServiceClient) RechargeWallet(ctx context.Context, in *RechargeWalletRequest, opts ...grpc.CallOption) (*RechargeWalletResponse, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(RechargeWalletResponse)
|
||||
err := c.cc.Invoke(ctx, WalletService_RechargeWallet_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *walletServiceClient) GetRechargeList(ctx context.Context, in *RechargeRequest, opts ...grpc.CallOption) (*RechargeResponse, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(RechargeResponse)
|
||||
err := c.cc.Invoke(ctx, WalletService_GetRechargeList_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// WalletServiceServer is the server API for WalletService service.
|
||||
// All implementations must embed UnimplementedWalletServiceServer
|
||||
// for forward compatibility
|
||||
@@ -624,6 +650,10 @@ type WalletServiceServer interface {
|
||||
// 查询扣款记录
|
||||
GetDeductions(context.Context, *GetDeductionsRequest) (*GetDeductionsResponse, error)
|
||||
GetDeductionByTransactionId(context.Context, *GetDeductionByTransactionIdRequest) (*GetDeductionByTransactionIdResponse, error)
|
||||
// 定义充值请求接口
|
||||
RechargeWallet(context.Context, *RechargeWalletRequest) (*RechargeWalletResponse, error)
|
||||
// 充值记录列表篇
|
||||
GetRechargeList(context.Context, *RechargeRequest) (*RechargeResponse, error)
|
||||
mustEmbedUnimplementedWalletServiceServer()
|
||||
}
|
||||
|
||||
@@ -643,6 +673,12 @@ func (UnimplementedWalletServiceServer) GetDeductions(context.Context, *GetDeduc
|
||||
func (UnimplementedWalletServiceServer) GetDeductionByTransactionId(context.Context, *GetDeductionByTransactionIdRequest) (*GetDeductionByTransactionIdResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method GetDeductionByTransactionId not implemented")
|
||||
}
|
||||
func (UnimplementedWalletServiceServer) RechargeWallet(context.Context, *RechargeWalletRequest) (*RechargeWalletResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method RechargeWallet not implemented")
|
||||
}
|
||||
func (UnimplementedWalletServiceServer) GetRechargeList(context.Context, *RechargeRequest) (*RechargeResponse, error) {
|
||||
return nil, status.Errorf(codes.Unimplemented, "method GetRechargeList not implemented")
|
||||
}
|
||||
func (UnimplementedWalletServiceServer) mustEmbedUnimplementedWalletServiceServer() {}
|
||||
|
||||
// UnsafeWalletServiceServer may be embedded to opt out of forward compatibility for this service.
|
||||
@@ -728,6 +764,42 @@ func _WalletService_GetDeductionByTransactionId_Handler(srv interface{}, ctx con
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _WalletService_RechargeWallet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(RechargeWalletRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(WalletServiceServer).RechargeWallet(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: WalletService_RechargeWallet_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(WalletServiceServer).RechargeWallet(ctx, req.(*RechargeWalletRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _WalletService_GetRechargeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(RechargeRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(WalletServiceServer).GetRechargeList(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: WalletService_GetRechargeList_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(WalletServiceServer).GetRechargeList(ctx, req.(*RechargeRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
// WalletService_ServiceDesc is the grpc.ServiceDesc for WalletService service.
|
||||
// It's only intended for direct use with grpc.RegisterService,
|
||||
// and not to be introspected or modified (even as a copy)
|
||||
@@ -751,6 +823,14 @@ var WalletService_ServiceDesc = grpc.ServiceDesc{
|
||||
MethodName: "GetDeductionByTransactionId",
|
||||
Handler: _WalletService_GetDeductionByTransactionId_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "RechargeWallet",
|
||||
Handler: _WalletService_RechargeWallet_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "GetRechargeList",
|
||||
Handler: _WalletService_GetRechargeList_Handler,
|
||||
},
|
||||
},
|
||||
Streams: []grpc.StreamDesc{},
|
||||
Metadata: "user.proto",
|
||||
|
||||
Reference in New Issue
Block a user