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

完善套餐与账单接口 & 完善支付数据保存，记录实付价格并关联优惠券

Browse Source
This commit is contained in:
luorijun
2026-03-26 14:39:19 +08:00
parent 5ffa151f58
commit 75ad12efb3
23 changed files with 706 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
web/services/resource.go
View File

@@ -1,7 +1,6 @@
package services
import (
"encoding/json"
"errors"
"fmt"
"platform/pkg/u"
@@ -11,6 +10,7 @@ import (
"time"
"github.com/shopspring/decimal"
"gorm.io/gen/field"
"gorm.io/gorm"
)
@@ -18,6 +18,7 @@ var Resource = &resourceService{}
type resourceService struct{}
// CreateResourceByBalance 通过余额购买套餐
func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data *CreateResourceData) error {
// 找到用户
@@ -29,16 +30,21 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
}
// 获取 sku
sku, err := s.GetSku(data)
sku, err := s.GetSku(data.Code())
if err != nil {
return err
}
// 检查余额
_, amount, err := s.GetPrice(sku, data.Count(), &uid)
coupon, _, amount, actual, err := s.GetPrice(sku, data.Count(), &uid, data.CouponCode)
if err != nil {
return err
}
couponId := (*int32)(nil)
if coupon != nil {
couponId = &coupon.ID
}
newBalance := user.Balance.Sub(amount)
if newBalance.IsNegative() {
return ErrBalanceNotEnough
@@ -58,49 +64,30 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
}
// 保存套餐
resource, err := createResource(q, uid, now, data)
resource, err := s.Create(q, uid, now, data)
if err != nil {
return core.NewServErr("创建套餐失败", err)
}
// 生成账单
err = q.Bill.Create(newForConsume(uid, Bill.GenNo(), sku.Name, amount, resource))
err = Bill.CreateForResourceByBalance(q, uid, resource.ID, couponId, sku.Name, amount, actual)
if err != nil {
return core.NewServErr("生成账单失败", err)
}
// 核销优惠券
if coupon != nil {
err = Coupon.UseCoupon(q, coupon.ID)
if err != nil {
return core.NewServErr("核销优惠券失败", err)
}
}
return nil
})
}
func (s *resourceService) CreateResourceByTrade(uid int32, now time.Time, data *CreateResourceByTradeData, trade *m.Trade) error { // 检查交易
if trade == nil {
return core.NewBizErr("交易数据不能为空")
}
if trade.Status != m.TradeStatusSuccess {
return core.NewBizErr("交易状态不正确")
}
return q.Q.Transaction(func(q *q.Query) error {
// 保存套餐
resource, err := createResource(q, uid, now, data.Req)
if err != nil {
return core.NewServErr("创建套餐失败", err)
}
// 生成账单
err = q.Bill.Create(newForConsume(uid, Bill.GenNo(), data.GetSubject(), data.GetAmount(), resource, trade))
if err != nil {
return core.NewServErr("生成账单失败", err)
}
return nil
})
}
func createResource(q *q.Query, uid int32, now time.Time, data *CreateResourceData) (*m.Resource, error) {
func (s *resourceService) Create(q *q.Query, uid int32, now time.Time, data *CreateResourceData) (*m.Resource, error) {
// 套餐基本信息
var resource = m.Resource{
UserID: uid,
@@ -162,10 +149,35 @@ func createResource(q *q.Query, uid int32, now time.Time, data *CreateResourceDa
return &resource, nil
}
func (s *resourceService) GetSku(data *CreateResourceData) (*m.ProductSku, error) {
func (s *resourceService) Update(data *UpdateResourceData) error {
if data.Active == nil {
return core.NewBizErr("更新套餐失败，active 不能为空")
}
do := make([]field.AssignExpr, 0)
if data.Active != nil {
do = append(do, q.Resource.Active.Value(*data.Active))
}
_, err := q.Resource.
Where(q.Resource.ID.Eq(data.Id)).
UpdateSimple(do...)
if err != nil {
return core.NewServErr("更新套餐失败", err)
}
return nil
}
type UpdateResourceData struct {
core.IdReq
Active *bool `json:"active"`
}
func (s *resourceService) GetSku(code string) (*m.ProductSku, error) {
sku, err := q.ProductSku.
Joins(q.ProductSku.Discount).
Where(q.ProductSku.Code.Eq(data.Code())).
Where(q.ProductSku.Code.Eq(code)).
Take()
if err != nil {
return nil, core.NewServErr("产品不可用", err)
@@ -178,43 +190,55 @@ func (s *resourceService) GetSku(data *CreateResourceData) (*m.ProductSku, error
return sku, nil
}
func (s *resourceService) GetPrice(sku *m.ProductSku, count int32, uid *int32) (decimal.Decimal, decimal.Decimal, error) {
func (s *resourceService) GetPrice(sku *m.ProductSku, count int32, uid *int32, couponCode *string) (*m.Coupon, decimal.Decimal, decimal.Decimal, decimal.Decimal, error) {
// 根据用户 id 查询特殊优惠
var uSku *m.ProductSkuUser
if uid != nil {
// 原价
price := sku.Price
amount := price.Mul(decimal.NewFromInt32(count))
// 折扣价
discount := sku.Discount.Decimal()
if uid != nil { // 用户特殊优惠
var err error
uSku, err = q.ProductSkuUser.
uSku, err := q.ProductSkuUser.
Joins(q.ProductSkuUser.Discount).
Where(
q.ProductSkuUser.UserID.Eq(*uid),
q.ProductSkuUser.ProductSkuID.Eq(sku.ID)).
Take()
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return decimal.Zero, decimal.Zero, core.NewServErr("客户特殊价查询失败", err)
return nil, decimal.Zero, decimal.Zero, decimal.Zero, core.NewServErr("客户特殊价查询失败", err)
}
if uSku.Discount == nil {
return nil, decimal.Zero, decimal.Zero, decimal.Zero, core.NewServErr("价格获取失败")
}
uDiscount := uSku.Discount.Decimal()
if uDiscount.Cmp(discount) > 0 {
discount = uDiscount
}
}
discounted := amount.Mul(discount)
if uSku.Discount == nil {
return decimal.Decimal{}, decimal.Decimal{}, core.NewServErr("价格获取失败")
// 优惠价
coupon := (*m.Coupon)(nil)
couponApplied := discounted.Copy()
if couponCode != nil {
var err error
coupon, err = Coupon.GetCouponAvailableByCode(*couponCode, discounted, uid)
if err != nil {
return nil, decimal.Zero, decimal.Zero, decimal.Zero, err
}
couponApplied = discounted.Sub(coupon.Amount)
}
// 返回计算价格
price := sku.Price
discount := sku.Discount.Decimal()
if uSku != nil {
discount = uSku.Discount.Decimal()
}
before := price.Mul(decimal.NewFromInt32(count))
after := before.Mul(discount)
return before, after, nil
return coupon, amount, discounted, couponApplied, nil
}
type CreateResourceData struct {
Type m.ResourceType `json:"type" validate:"required"`
Short *CreateShortResourceData `json:"short,omitempty"`
Long *CreateLongResourceData `json:"long,omitempty"`
Type m.ResourceType `json:"type" validate:"required"`
Short *CreateShortResourceData `json:"short,omitempty"`
Long *CreateLongResourceData `json:"long,omitempty"`
CouponCode *string `json:"coupon,omitempty"`
}
type CreateShortResourceData struct {
@@ -267,71 +291,22 @@ func (c *CreateResourceData) Code() string {
}
}
func (c *CreateResourceData) Serialize() (string, error) {
bytes, err := json.Marshal(c)
return string(bytes), err
}
func (c *CreateResourceData) Deserialize(str string) error {
return json.Unmarshal([]byte(str), c)
}
// 交易后创建套餐
type ResourceOnTradeComplete struct{}
func (r ResourceOnTradeComplete) Check(t m.TradeType) (ProductInfo, bool) {
if t == m.TradeTypePurchase {
return &CreateResourceByTradeData{}, true
}
return nil, false
}
func (r ResourceOnTradeComplete) OnTradeComplete(info ProductInfo, trade *m.Trade) error {
return Resource.CreateResourceByTrade(trade.UserID, time.Time(*trade.CompletedAt), info.(*CreateResourceByTradeData), trade)
}
type CreateResourceByTradeData struct {
Subject string `json:"subject"`
Amount decimal.Decimal `json:"amount"`
Req *CreateResourceData `json:"data"`
}
func (e CreateResourceByTradeData) GetType() m.TradeType {
return m.TradeTypePurchase
}
func (e CreateResourceByTradeData) GetSubject() string {
return e.Subject
}
func (e CreateResourceByTradeData) GetAmount() decimal.Decimal {
return e.Amount
}
func (e CreateResourceByTradeData) Serialize() (string, error) {
bytes, err := json.Marshal(e)
return string(bytes), err
}
func (e *CreateResourceByTradeData) Deserialize(str string) error {
return json.Unmarshal([]byte(str), e)
}
func NewCreateResourceByTradeData(req *CreateResourceData) (*CreateResourceByTradeData, error) {
sku, err := Resource.GetSku(req)
func (c *CreateResourceData) TradeDetail() (*TradeDetail, error) {
sku, err := Resource.GetSku(c.Code())
if err != nil {
return nil, err
}
_, amount, err := Resource.GetPrice(sku, req.Count(), nil)
coupon, _, amount, actual, err := Resource.GetPrice(sku, c.Count(), nil, c.CouponCode)
if err != nil {
return nil, err
}
return &CreateResourceByTradeData{
Subject: sku.Name,
Amount: amount,
Req: req,
return &TradeDetail{
m.TradeTypePurchase,
sku.Name,
amount, actual,
&coupon.ID, c,
}, nil
}