team/tianyuan-api-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new

Browse Source
This commit is contained in:
liangzai
2024-10-16 20:46:46 +08:00
parent fdfdbb5ff6
commit 185b8aef90
14 changed files with 546 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/user/internal/logic/enterprise/reviewenterpriselogic.go
View File

@@ -72,7 +72,11 @@ func (l *ReviewEnterpriseLogic) ReviewEnterprise(in *user.ReviewEnterpriseReq) (
if insertEnterpriseErr != nil {
return insertEnterpriseErr
}
_, InsertWalletsTransErr := l.svcCtx.WalletsModel.InsertWalletsTrans(l.ctx, &model.Wallets{UserId: enterpriseAuth.UserId}, session)
userConfig, FindUserConfigErr := l.svcCtx.UserConfigModel.FindOne(l.ctx, 1)
if FindUserConfigErr != nil {
return FindUserConfigErr
}
_, InsertWalletsTransErr := l.svcCtx.WalletsModel.InsertWalletsTrans(l.ctx, &model.Wallets{UserId: enterpriseAuth.UserId, Balance: userConfig.GiftAmount}, session)
if InsertWalletsTransErr != nil {
return InsertWalletsTransErr
}
@@ -83,7 +87,6 @@ func (l *ReviewEnterpriseLogic) ReviewEnterprise(in *user.ReviewEnterpriseReq) (
return createSecretErr
}
}
return nil
})

16
apps/user/internal/logic/walletservice/rechargewalletlogic.go
View File

@@ -68,6 +68,22 @@ func (l *RechargeWalletLogic) RechargeWallet(in *user.RechargeWalletRequest) (*u
if err != nil {
return err
}
wallet, findWalletErr := l.svcCtx.WalletsModel.FindOneByUserId(l.ctx, in.UserId)
if findWalletErr != nil {
return err
}
if wallet.Balance > 0 {
userModel, findUserErr := l.svcCtx.UserModel.FindOne(l.ctx, in.UserId)
if findUserErr != nil {
return findUserErr
}
userModel.QuotaExceeded = 0
_, updateUserErr := l.svcCtx.UserModel.UpdateUserTrans(l.ctx, userModel, session)
if updateUserErr != nil {
return updateUserErr
}
}
return nil
})

23
apps/user/internal/model/rechargemodel_gen.go
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
}

27
apps/user/internal/model/userconfigmodel.go Normal file
View File

@@ -0,0 +1,27 @@
package model
import (
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
var _ UserConfigModel = (*customUserConfigModel)(nil)
type (
// UserConfigModel is an interface to be customized, add more methods here,
// and implement the added methods in customUserConfigModel.
UserConfigModel interface {
userConfigModel
}
customUserConfigModel struct {
*defaultUserConfigModel
}
)
// NewUserConfigModel returns a model for the database table.
func NewUserConfigModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) UserConfigModel {
return &customUserConfigModel{
defaultUserConfigModel: newUserConfigModel(conn, c, opts...),
}
}

113
apps/user/internal/model/userconfigmodel_gen.go Normal file
View File

@@ -0,0 +1,113 @@
// 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 (
userConfigFieldNames = builder.RawFieldNames(&UserConfig{})
userConfigRows = strings.Join(userConfigFieldNames, ",")
userConfigRowsExpectAutoSet = strings.Join(stringx.Remove(userConfigFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",")
userConfigRowsWithPlaceHolder = strings.Join(stringx.Remove(userConfigFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?"
cacheUserConfigIdPrefix = "cache:userConfig:id:"
)
type (
userConfigModel interface {
Insert(ctx context.Context, data *UserConfig) (sql.Result, error)
FindOne(ctx context.Context, id int64) (*UserConfig, error)
Update(ctx context.Context, data *UserConfig) error
Delete(ctx context.Context, id int64) error
}
defaultUserConfigModel struct {
sqlc.CachedConn
table string
}
UserConfig struct {
Id int64 `db:"id"` // 主键
GiftAmount float64 `db:"gift_amount"` // 赠送额度
CreatedAt time.Time `db:"created_at"` // 创建时间
UpdatedAt time.Time `db:"updated_at"` // 更新时间
}
)
func newUserConfigModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultUserConfigModel {
return &defaultUserConfigModel{
CachedConn: sqlc.NewConn(conn, c, opts...),
table: "`user_config`",
}
}
func (m *defaultUserConfigModel) Delete(ctx context.Context, id int64) error {
userConfigIdKey := fmt.Sprintf("%s%v", cacheUserConfigIdPrefix, id)
_, 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)
}, userConfigIdKey)
return err
}
func (m *defaultUserConfigModel) FindOne(ctx context.Context, id int64) (*UserConfig, error) {
userConfigIdKey := fmt.Sprintf("%s%v", cacheUserConfigIdPrefix, id)
var resp UserConfig
err := m.QueryRowCtx(ctx, &resp, userConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error {
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userConfigRows, 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 *defaultUserConfigModel) Insert(ctx context.Context, data *UserConfig) (sql.Result, error) {
userConfigIdKey := fmt.Sprintf("%s%v", cacheUserConfigIdPrefix, data.Id)
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, userConfigRowsExpectAutoSet)
return conn.ExecCtx(ctx, query, data.GiftAmount)
}, userConfigIdKey)
return ret, err
}
func (m *defaultUserConfigModel) Update(ctx context.Context, data *UserConfig) error {
userConfigIdKey := fmt.Sprintf("%s%v", cacheUserConfigIdPrefix, data.Id)
_, 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, userConfigRowsWithPlaceHolder)
return conn.ExecCtx(ctx, query, data.GiftAmount, data.Id)
}, userConfigIdKey)
return err
}
func (m *defaultUserConfigModel) formatPrimary(primary any) string {
return fmt.Sprintf("%s%v", cacheUserConfigIdPrefix, primary)
}
func (m *defaultUserConfigModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error {
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userConfigRows, m.table)
return conn.QueryRowCtx(ctx, v, query, primary)
}
func (m *defaultUserConfigModel) tableName() string {
return m.table
}

2
apps/user/internal/svc/servicecontext.go
View File

@@ -20,6 +20,7 @@ type ServiceContext struct {
DeductionsModel model.DeductionsModel
ApiRequestsModel model.ApiRequestsModel
RechargeModel model.RechargeModel
UserConfigModel model.UserConfigModel
SecretRpc sentinel.SecretClient
ProductRpc sentinel.ProductClient
}
@@ -56,6 +57,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
Config: c,
Redis: rds, // 单独使用的 Redis 客户端
UserModel: model.NewUsersModel(db, c.CacheRedis), // 注入UserModel
UserConfigModel: model.NewUserConfigModel(db, c.CacheRedis),
EnterpriseModel: model.NewEnterpriseInfoModel(db, c.CacheRedis),
EnterpriseAuthModel: model.NewEnterpriseAuthModel(db, c.CacheRedis),
WalletsModel: model.NewWalletsModel(db, c.CacheRedis),

18
apps/user/user.sql
View File

@@ -74,11 +74,19 @@ CREATE TABLE api_requests (
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-对公转账',
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-对公转账',
remark VARCHAR(255) COMMENT '备注',
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='充值记录表';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='充值记录表';
CREATE TABLE `user_config` (
id INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`gift_amount` DECIMAL(10, 2) DEFAULT 0.00 COMMENT '赠送额度',
`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='用户配置表';