lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 12 Activity

重构优化套餐数据结构，修复提取计数问题

Browse Source
This commit is contained in:
luorijun
2025-12-10 20:07:33 +08:00
parent c8c86081d9
commit 05fba68b3e
11 changed files with 310 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
web/services/resource.go
View File

@@ -2,6 +2,7 @@ package services
import (
"encoding/json"
"errors"
"fmt"
"platform/pkg/u"
"platform/web/core"
@@ -29,15 +30,19 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
}
// 检查余额
var amount = user.Balance.Sub(data.GetAmount())
if amount.IsNegative() {
amount, err := data.GetAmount()
if err != nil {
return err
}
balance := user.Balance.Sub(amount)
if balance.IsNegative() {
return ErrBalanceNotEnough
}
// 更新用户余额
_, err = q.User.
Where(q.User.ID.Eq(uid), q.User.Balance.Eq(user.Balance)).
UpdateSimple(q.User.Balance.Value(amount))
UpdateSimple(q.User.Balance.Value(balance))
if err != nil {
return core.NewServErr("更新用户余额失败", err)
}
@@ -49,7 +54,11 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
}
// 生成账单
err = q.Bill.Create(newForConsume(uid, Bill.GenNo(), data.GetSubject(), data.GetAmount(), resource))
subject, err := data.GetSubject()
if err != nil {
return err
}
err = q.Bill.Create(newForConsume(uid, Bill.GenNo(), subject, amount, resource))
if err != nil {
return core.NewServErr("生成账单失败", err)
}
@@ -61,6 +70,13 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
func (s *resourceService) CreateResourceByTrade(uid int32, now time.Time, data *CreateResourceData, trade *m.Trade) error {
return q.Q.Transaction(func(q *q.Query) error {
// 检查交易
if trade == nil {
return core.NewBizErr("交易数据不能为空")
}
if trade.Status != m.TradeStatusSuccess {
return core.NewBizErr("交易状态不正确")
}
// 保存套餐
resource, err := createResource(q, uid, now, data)
@@ -69,7 +85,15 @@ func (s *resourceService) CreateResourceByTrade(uid int32, now time.Time, data *
}
// 生成账单
err = q.Bill.Create(newForConsume(uid, Bill.GenNo(), data.GetSubject(), data.GetAmount(), resource, trade))
subject, err := data.GetSubject()
if err != nil {
return err
}
amount, err := data.GetAmount()
if err != nil {
return err
}
err = q.Bill.Create(newForConsume(uid, Bill.GenNo(), subject, amount, resource, trade))
if err != nil {
return core.NewServErr("生成账单失败", err)
}
@@ -95,13 +119,17 @@ func createResource(q *q.Query, uid int32, now time.Time, data *CreateResourceDa
if short == nil {
return nil, core.NewBizErr("短效套餐数据不能为空")
}
var duration = time.Duration(short.Expire) * 24 * time.Hour
resource.Short = &m.ResourceShort{
Type: short.Mode,
Live: short.Live,
Quota: &short.Quota,
Expire: u.P(now.Add(duration)),
DailyLimit: short.DailyLimit,
Live: short.Live,
Type: short.Mode,
Quota: short.Quota,
}
if short.Mode == m.ResourceModeTime {
if short.Expire == nil {
return nil, core.NewBizErr("包时套餐过期时间不能为空")
}
var duration = time.Duration(*short.Expire) * 24 * time.Hour
resource.Short.ExpireAt = u.P(now.Add(duration))
}
// 长效套餐
@@ -110,13 +138,17 @@ func createResource(q *q.Query, uid int32, now time.Time, data *CreateResourceDa
if long == nil {
return nil, core.NewBizErr("长效套餐数据不能为空")
}
var duration = time.Duration(long.Expire) * 24 * time.Hour
resource.Long = &m.ResourceLong{
Type: long.Mode,
Live: long.Live,
Quota: &long.Quota,
Expire: u.P(now.Add(duration)),
DailyLimit: long.DailyLimit,
Live: long.Live,
Type: long.Mode,
Quota: long.Quota,
}
if long.Mode == m.ResourceModeTime {
if long.Expire == nil {
return nil, core.NewBizErr("包时套餐过期时间不能为空")
}
var duration = time.Duration(*long.Expire) * 24 * time.Hour
resource.Long.ExpireAt = u.P(now.Add(duration))
}
default:
return nil, core.NewBizErr("不支持的套餐类型")
@@ -137,22 +169,20 @@ type CreateResourceData struct {
}
type CreateShortResourceData struct {
Live int32 `json:"live" validate:"required,min=180"`
Mode m.ResourceMode `json:"mode" validate:"required"`
Expire int32 `json:"expire"`
DailyLimit int32 `json:"daily_limit" validate:"min=2000"`
Quota int32 `json:"quota" validate:"min=10000"`
Live int32 `json:"live" validate:"required,min=180"`
Mode m.ResourceMode `json:"mode" validate:"required"`
Quota int32 `json:"quota"`
Expire *int32 `json:"expire"`
name string
price *decimal.Decimal
}
type CreateLongResourceData struct {
Live int32 `json:"live" validate:"required,oneof=1 4 8 12 24"`
Mode m.ResourceMode `json:"mode" validate:"required,oneof=1 2"`
Expire int32 `json:"expire"`
DailyLimit int32 `json:"daily_limit" validate:"min=100"`
Quota int32 `json:"quota" validate:"min=500"`
Live int32 `json:"live" validate:"required"`
Mode m.ResourceMode `json:"mode" validate:"required"`
Quota int32 `json:"quota" validate:"required"`
Expire *int32 `json:"expire" validate:"required"`
name string
price *decimal.Decimal
@@ -162,24 +192,28 @@ func (c *CreateResourceData) GetType() m.TradeType {
return m.TradeTypePurchase
}
func (c *CreateResourceData) GetSubject() string {
func (c *CreateResourceData) GetSubject() (string, error) {
switch c.Type {
default:
return "", errors.New("无效的套餐类型")
case m.ResourceTypeShort:
return c.Short.GetSubject()
case m.ResourceTypeLong:
return c.Long.GetSubject()
}
panic("类型对应的数据为空")
}
func (c *CreateResourceData) GetAmount() decimal.Decimal {
func (c *CreateResourceData) GetAmount() (decimal.Decimal, error) {
switch c.Type {
default:
return decimal.Zero, errors.New("无效的套餐类型")
case m.ResourceTypeShort:
return c.Short.GetAmount()
case m.ResourceTypeLong:
return c.Long.GetAmount()
}
panic("类型对应的数据为空")
}
func (c *CreateResourceData) Serialize() (string, error) {
@@ -191,27 +225,37 @@ func (c *CreateResourceData) Deserialize(str string) error {
return json.Unmarshal([]byte(str), c)
}
func (data *CreateShortResourceData) GetSubject() string {
func (data *CreateShortResourceData) GetSubject() (string, error) {
if data.name == "" {
var mode string
switch data.Mode {
case 1:
default:
return "", errors.New("无效的套餐模式")
case m.ResourceModeTime:
mode = "包时"
case 2:
case m.ResourceModeQuota:
mode = "包量"
}
data.name = fmt.Sprintf("短效动态%s %v 分钟", mode, data.Live/60)
}
return data.name
return data.name, nil
}
func (data *CreateShortResourceData) GetAmount() decimal.Decimal {
func (data *CreateShortResourceData) GetAmount() (decimal.Decimal, error) {
if data.price == nil {
var factor int32
switch data.Mode {
case 1:
factor = data.DailyLimit * data.Expire
case 2:
default:
return decimal.Zero, errors.New("无效的套餐模式")
case m.ResourceModeTime:
if data.Expire == nil {
return decimal.Zero, errors.New("包时套餐过期时间不能为空")
}
factor = data.Quota * *data.Expire
case m.ResourceModeQuota:
factor = data.Quota
}
@@ -223,38 +267,53 @@ func (data *CreateShortResourceData) GetAmount() decimal.Decimal {
var dec = decimal.Decimal{}.
Add(decimal.NewFromInt32(base * factor)).
Div(decimal.NewFromInt(30000))
if dec.IsZero() {
return decimal.Zero, errors.New("计算金额错误")
}
data.price = &dec
}
return *data.price
return *data.price, nil
}
func (data *CreateLongResourceData) GetSubject() string {
func (data *CreateLongResourceData) GetSubject() (string, error) {
if data.name == "" {
var mode string
switch data.Mode {
case 1:
default:
return "", errors.New("无效的套餐模式")
case m.ResourceModeTime:
mode = "包时"
case 2:
case m.ResourceModeQuota:
mode = "包量"
}
data.name = fmt.Sprintf("长效动态%s %d 小时", mode, data.Live)
}
return data.name
return data.name, nil
}
func (data *CreateLongResourceData) GetAmount() decimal.Decimal {
func (data *CreateLongResourceData) GetAmount() (decimal.Decimal, error) {
if data.price == nil {
var factor int32 = 0
switch data.Mode {
default:
return decimal.Zero, errors.New("无效的套餐模式")
case m.ResourceModeTime:
factor = data.Expire * data.DailyLimit
if data.Expire == nil {
return decimal.Zero, errors.New("包时套餐过期时间不能为空")
}
factor = *data.Expire * data.Quota
case m.ResourceModeQuota:
factor = data.Quota
}
var base int32
switch data.Live {
default:
return decimal.Zero, errors.New("无效的套餐时长")
case 1:
base = 30
case 4:
@@ -271,9 +330,13 @@ func (data *CreateLongResourceData) GetAmount() decimal.Decimal {
var dec = decimal.Decimal{}.
Add(decimal.NewFromInt32(base * factor)).
Div(decimal.NewFromInt(100))
if dec.IsZero() {
return decimal.Zero, errors.New("计算金额错误")
}
data.price = &dec
}
return *data.price
return *data.price, nil
}
type ResourceOnTradeComplete struct{}