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

优化交易创建流程，客户管理新增折扣与来源字段及功能

Browse Source
This commit is contained in:
luorijun
2026-03-27 16:16:55 +08:00
parent 75ad12efb3
commit 7e8d824ba6
26 changed files with 523 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/services/bill.go
View File

@@ -3,8 +3,6 @@ package services
import (
m "platform/web/models"
q "platform/web/queries"
"github.com/shopspring/decimal"
)
var Bill = &billService{}
@@ -23,12 +21,12 @@ func (s *billService) CreateForBalance(q *q.Query, uid, tradeId int32, detail *T
})
}
func (s *billService) CreateForResourceByTrade(q *q.Query, uid, tradeId, resourceId int32, detail *TradeDetail) error {
func (s *billService) CreateForResource(q *q.Query, uid, resourceId int32, tradeId *int32, detail *TradeDetail) error {
return q.Bill.Create(&m.Bill{
UserID: uid,
BillNo: ID.GenReadable("bil"),
ResourceID: &resourceId,
TradeID: &tradeId,
TradeID: tradeId,
CouponID: detail.CouponId,
Type: m.BillTypeConsume,
Info: &detail.Subject,
@@ -36,16 +34,3 @@ func (s *billService) CreateForResourceByTrade(q *q.Query, uid, tradeId, resourc
Actual: detail.Actual,
})
}
func (s *billService) CreateForResourceByBalance(q *q.Query, uid, resourceId int32, couponId *int32, subject string, amount, actual decimal.Decimal) error {
return q.Bill.Create(&m.Bill{
UserID: uid,
BillNo: ID.GenReadable("bil"),
ResourceID: &resourceId,
CouponID: couponId,
Type: m.BillTypeConsume,
Info: &subject,
Amount: amount,
Actual: actual,
})
}

75
web/services/coupon.go
View File

@@ -9,6 +9,7 @@ import (
"time"
"github.com/shopspring/decimal"
"gorm.io/gen/field"
"gorm.io/gorm"
)
@@ -16,6 +17,80 @@ var Coupon = &couponService{}
type couponService struct{}
func (s *couponService) All() (result []*m.Coupon, err error) {
return q.Coupon.Find()
}
func (s *couponService) Page(req *core.PageReq) (result []*m.Coupon, count int64, err error) {
return q.Coupon.FindByPage(req.GetOffset(), req.GetLimit())
}
func (s *couponService) Create(data CreateCouponData) error {
return q.Coupon.Create(&m.Coupon{
UserID: data.UserID,
Code: data.Code,
Remark: data.Remark,
Amount: data.Amount,
MinAmount: data.MinAmount,
Status: m.CouponStatusUnused,
ExpireAt: data.ExpireAt,
})
}
type CreateCouponData struct {
UserID *int32 `json:"user_id"`
Code string `json:"code" validate:"required"`
Remark *string `json:"remark"`
Amount decimal.Decimal `json:"amount" validate:"required"`
MinAmount decimal.Decimal `json:"min_amount"`
ExpireAt *time.Time `json:"expire_at"`
}
func (s *couponService) Update(data UpdateCouponData) error {
do := make([]field.AssignExpr, 0)
if data.UserID != nil {
do = append(do, q.Coupon.UserID.Value(*data.UserID))
}
if data.Code != nil {
do = append(do, q.Coupon.Code.Value(*data.Code))
}
if data.Remark != nil {
do = append(do, q.Coupon.Remark.Value(*data.Remark))
}
if data.Amount != nil {
do = append(do, q.Coupon.Amount.Value(*data.Amount))
}
if data.MinAmount != nil {
do = append(do, q.Coupon.MinAmount.Value(*data.MinAmount))
}
if data.Status != nil {
do = append(do, q.Coupon.Status.Value(int(*data.Status)))
}
if data.ExpireAt != nil {
do = append(do, q.Coupon.ExpireAt.Value(*data.ExpireAt))
}
_, err := q.Coupon.Where(q.Coupon.ID.Eq(data.ID)).UpdateSimple(do...)
return err
}
type UpdateCouponData struct {
ID int32 `json:"id" validate:"required"`
UserID *int32 `json:"user_id"`
Code *string `json:"code"`
Remark *string `json:"remark"`
Amount *decimal.Decimal `json:"amount"`
MinAmount *decimal.Decimal `json:"min_amount"`
Status *m.CouponStatus `json:"status"`
ExpireAt *time.Time `json:"expire_at"`
}
func (s *couponService) Delete(id int32) error {
_, err := q.Coupon.Where(q.Coupon.ID.Eq(id)).UpdateColumn(q.Coupon.DeletedAt, time.Now())
return err
}
func (s *couponService) GetCouponAvailableByCode(code string, amount decimal.Decimal, uid *int32) (*m.Coupon, error) {
// 获取优惠券
coupon, err := q.Coupon.Where(

129
web/services/resource.go
View File

@@ -1,7 +1,6 @@
package services
import (
"errors"
"fmt"
"platform/pkg/u"
"platform/web/core"
@@ -11,7 +10,6 @@ import (
"github.com/shopspring/decimal"
"gorm.io/gen/field"
"gorm.io/gorm"
)
var Resource = &resourceService{}
@@ -19,33 +17,16 @@ var Resource = &resourceService{}
type resourceService struct{}
// CreateResourceByBalance 通过余额购买套餐
func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data *CreateResourceData) error {
// 找到用户
user, err := q.User.
Where(q.User.ID.Eq(uid)).
Take()
if err != nil {
return err
}
func (s *resourceService) CreateResourceByBalance(user *m.User, data *CreateResourceData) error {
now := time.Now()
// 获取 sku
sku, err := s.GetSku(data.Code())
detail, err := data.TradeDetail(user)
if err != nil {
return err
return core.NewServErr("获取产品支付信息失败", err)
}
// 检查余额
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)
newBalance := user.Balance.Sub(detail.Actual)
if newBalance.IsNegative() {
return ErrBalanceNotEnough
}
@@ -55,7 +36,7 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
// 更新用户余额
_, err = q.User.
Where(
q.User.ID.Eq(uid),
q.User.ID.Eq(user.ID),
q.User.Balance.Eq(user.Balance),
).
UpdateSimple(q.User.Balance.Value(newBalance))
@@ -64,20 +45,20 @@ func (s *resourceService) CreateResourceByBalance(uid int32, now time.Time, data
}
// 保存套餐
resource, err := s.Create(q, uid, now, data)
resource, err := s.Create(q, user.ID, now, data)
if err != nil {
return core.NewServErr("创建套餐失败", err)
}
// 生成账单
err = Bill.CreateForResourceByBalance(q, uid, resource.ID, couponId, sku.Name, amount, actual)
err = Bill.CreateForResource(q, user.ID, resource.ID, nil, detail)
if err != nil {
return core.NewServErr("生成账单失败", err)
}
// 核销优惠券
if coupon != nil {
err = Coupon.UseCoupon(q, coupon.ID)
if detail.CouponId != nil {
err = Coupon.UseCoupon(q, *detail.CouponId)
if err != nil {
return core.NewServErr("核销优惠券失败", err)
}
@@ -174,64 +155,59 @@ type UpdateResourceData struct {
Active *bool `json:"active"`
}
func (s *resourceService) GetSku(code string) (*m.ProductSku, error) {
func (s *resourceService) CalcPrice(skuCode string, count int32, user *m.User, couponCode *string) (*m.ProductSku, *m.ProductDiscount, *m.Coupon, decimal.Decimal, decimal.Decimal, error) {
sku, err := q.ProductSku.
Joins(q.ProductSku.Discount).
Where(q.ProductSku.Code.Eq(code)).
Where(q.ProductSku.Code.Eq(skuCode)).
Take()
if err != nil {
return nil, core.NewServErr("产品不可用", err)
return nil, nil, nil, decimal.Zero, decimal.Zero, core.NewServErr("产品不可用", err)
}
if sku.Discount == nil {
return nil, core.NewServErr("价格查询失败", err)
}
return sku, nil
}
func (s *resourceService) GetPrice(sku *m.ProductSku, count int32, uid *int32, couponCode *string) (*m.Coupon, decimal.Decimal, decimal.Decimal, decimal.Decimal, error) {
// 原价
price := sku.Price
amount := price.Mul(decimal.NewFromInt32(count))
// 折扣价
discount := sku.Discount.Decimal()
if uid != nil { // 用户特殊优惠
var err error
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 nil, decimal.Zero, decimal.Zero, decimal.Zero, core.NewServErr("客户特殊价查询失败", err)
discount := sku.Discount
if discount == nil {
return nil, nil, nil, decimal.Zero, decimal.Zero, core.NewServErr("价格查询失败", err)
}
discountRate := discount.Rate()
if user != nil && user.DiscountID != nil { // 用户特殊优惠
uDiscount, err := q.ProductDiscount.Where(q.ProductDiscount.ID.Eq(*user.DiscountID)).Take()
if err != nil {
return nil, nil, nil, 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 {
uDiscountRate := uDiscount.Rate()
if uDiscountRate.Cmp(discountRate) > 0 {
discountRate = uDiscountRate
discount = uDiscount
}
}
discounted := amount.Mul(discount)
discounted := amount.Mul(discountRate)
// 优惠价
uid := (*int32)(nil)
if user != nil {
uid = &user.ID
}
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
return nil, nil, nil, decimal.Zero, decimal.Zero, err
}
couponApplied = discounted.Sub(coupon.Amount)
}
return coupon, amount, discounted, couponApplied, nil
return sku, discount, coupon, discounted, couponApplied, nil
}
type CreateResourceData struct {
@@ -261,52 +237,49 @@ type CreateLongResourceData struct {
price *decimal.Decimal
}
func (c *CreateResourceData) Count() int32 {
func (data *CreateResourceData) Count() int32 {
switch {
default:
return 0
case c.Type == m.ResourceTypeShort && c.Short != nil:
return c.Short.Quota
case c.Type == m.ResourceTypeLong && c.Long != nil:
return c.Long.Quota
case data.Type == m.ResourceTypeShort && data.Short != nil:
return data.Short.Quota
case data.Type == m.ResourceTypeLong && data.Long != nil:
return data.Long.Quota
}
}
func (c *CreateResourceData) Code() string {
func (data *CreateResourceData) Code() string {
switch {
default:
return ""
case c.Type == m.ResourceTypeShort && c.Short != nil:
case data.Type == m.ResourceTypeShort && data.Short != nil:
return fmt.Sprintf(
"mode=%s,live=%d,expire=%d",
c.Short.Mode.Code(), c.Short.Live, u.Else(c.Short.Expire, 0),
data.Short.Mode.Code(), data.Short.Live, u.Else(data.Short.Expire, 0),
)
case c.Type == m.ResourceTypeLong && c.Long != nil:
case data.Type == m.ResourceTypeLong && data.Long != nil:
return fmt.Sprintf(
"mode=%s,live=%d,expire=%d",
c.Long.Mode.Code(), c.Long.Live, u.Else(c.Long.Expire, 0),
data.Long.Mode.Code(), data.Long.Live, u.Else(data.Long.Expire, 0),
)
}
}
func (c *CreateResourceData) TradeDetail() (*TradeDetail, error) {
sku, err := Resource.GetSku(c.Code())
if err != nil {
return nil, err
}
coupon, _, amount, actual, err := Resource.GetPrice(sku, c.Count(), nil, c.CouponCode)
func (data *CreateResourceData) TradeDetail(user *m.User) (*TradeDetail, error) {
sku, discount, coupon, amount, actual, err := Resource.CalcPrice(data.Code(), data.Count(), user, data.CouponCode)
if err != nil {
return nil, err
}
return &TradeDetail{
data,
m.TradeTypePurchase,
sku.Name,
amount, actual,
&coupon.ID, c,
&discount.ID, discount,
&coupon.ID, coupon,
}, nil
}

31
web/services/trade.go
View File

@@ -32,8 +32,12 @@ type tradeService struct {
}
// 创建交易
func (s *tradeService) Create(uid int32, tradeData *CreateTradeData, productData *CreateResourceData) (*CreateTradeResult, error) {
detail, err := productData.TradeDetail()
func (s *tradeService) Create(user *m.User, tradeData *CreateTradeData, productData *CreateResourceData) (*CreateTradeResult, error) {
if user == nil {
return nil, core.NewBizErr("用户未登录")
}
detail, err := productData.TradeDetail(user)
if err != nil {
return nil, core.NewServErr("获取产品支付信息失败", err)
}
@@ -178,7 +182,7 @@ func (s *tradeService) Create(uid int32, tradeData *CreateTradeData, productData
// 保存订单
err = q.Trade.Create(&m.Trade{
UserID: uid,
UserID: user.ID,
InnerNo: tradeNo,
Type: detail.Type,
Subject: detail.Subject,
@@ -208,7 +212,7 @@ func (s *tradeService) Create(uid int32, tradeData *CreateTradeData, productData
}
// 提交异步关闭事件
_, err = g.Asynq.Enqueue(e.NewCloseTradeTask(uid, tradeNo, method), asynq.ProcessAt(expireAt))
_, err = g.Asynq.Enqueue(e.NewCloseTradeTask(user.ID, tradeNo, method), asynq.ProcessAt(expireAt))
if err != nil {
return nil, core.NewServErr("提交异步关闭事件失败", err)
}
@@ -318,7 +322,7 @@ func (s *tradeService) OnCompleteTrade(user *m.User, interNo string, outerNo str
}
// 生成账单
err = Bill.CreateForResourceByTrade(q, user.ID, resource.ID, trade.ID, &detail)
err = Bill.CreateForResource(q, user.ID, resource.ID, &trade.ID, &detail)
if err != nil {
return core.NewServErr("生成账单失败", err)
}
@@ -602,16 +606,19 @@ type OnTradeCompletedData struct {
}
type ProductInfo interface {
TradeDetail() (*TradeDetail, error)
TradeDetail(user *m.User) (*TradeDetail, error)
}
type TradeDetail struct {
Type m.TradeType `json:"type"`
Subject string `json:"subject"`
Amount decimal.Decimal `json:"amount"`
Actual decimal.Decimal `json:"actual"`
CouponId *int32 `json:"coupon_id,omitempty"`
Product ProductInfo `json:"product"`
Product ProductInfo `json:"product"`
Type m.TradeType `json:"type"`
Subject string `json:"subject"`
Amount decimal.Decimal `json:"amount"`
Actual decimal.Decimal `json:"actual"`
DiscountId *int32 `json:"discount_id,omitempty"`
Discount *m.ProductDiscount `json:"-"` // 不应缓存
CouponId *int32 `json:"coupon_id,omitempty"`
Coupon *m.Coupon `json:"-"` // 不应缓存
}
type CompleteEvent interface {

8
web/services/user.go
View File

@@ -51,12 +51,14 @@ type UpdateBalanceData struct {
Amount int `json:"amount"`
}
func (c *UpdateBalanceData) TradeDetail() (*TradeDetail, error) {
amount := decimal.NewFromInt(int64(c.Amount)).Div(decimal.NewFromInt(100))
func (data *UpdateBalanceData) TradeDetail(user *m.User) (*TradeDetail, error) {
amount := decimal.NewFromInt(int64(data.Amount)).Div(decimal.NewFromInt(100))
return &TradeDetail{
data,
m.TradeTypeRecharge,
fmt.Sprintf("账户充值 - %s元", amount.StringFixed(2)),
amount, amount,
nil, c,
nil, nil,
nil, nil,
}, nil
}