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

web/services/resource.go

@@ -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
 }