fix(purchase): correct gift amount deduction logic and enhance payment processing comments

internal/logic/public/order/purchaseLogic.go

@@ -132,7 +132,7 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		if u.GiftAmount >= amount {
 			deductionAmount = amount
 			amount = 0
-			u.GiftAmount -= amount
+			u.GiftAmount -= deductionAmount
 		} else {
 			deductionAmount = u.GiftAmount
 			amount -= u.GiftAmount

internal/logic/public/portal/purchaseCheckoutLogic.go

@@ -28,13 +28,16 @@ import (
 	"github.com/pkg/errors"
 )
 
+// PurchaseCheckoutLogic handles the checkout process for various payment methods
+// including EPay, Stripe, Alipay F2F, and balance payments
 type PurchaseCheckoutLogic struct {
 	logger.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-// NewPurchaseCheckoutLogic Purchase Checkout
+// NewPurchaseCheckoutLogic creates a new instance of PurchaseCheckoutLogic
+// for handling purchase checkout operations across different payment platforms
 func NewPurchaseCheckoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PurchaseCheckoutLogic {
 	return &PurchaseCheckoutLogic{
 		Logger: logger.WithContext(ctx),
@@ -43,88 +46,104 @@ func NewPurchaseCheckoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
+// PurchaseCheckout processes the checkout for an order using the specified payment method
+// It validates the order, retrieves payment configuration, and routes to the appropriate payment handler
 func (l *PurchaseCheckoutLogic) PurchaseCheckout(req *types.CheckoutOrderRequest) (resp *types.CheckoutOrderResponse, err error) {
-	// Find order
+	// Validate and retrieve order information
 	orderInfo, err := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
 	if err != nil {
 		l.Logger.Error("[PurchaseCheckout] Find order failed", logger.Field("error", err.Error()), logger.Field("orderNo", req.OrderNo))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.OrderNotExist), "order not exist: %v", req.OrderNo)
 	}
 
+	// Verify order is in pending payment status (status = 1)
 	if orderInfo.Status != 1 {
 		l.Logger.Error("[PurchaseCheckout] Order status error", logger.Field("status", orderInfo.Status))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.OrderStatusError), "order status error: %v", orderInfo.Status)
 	}
 
-	// find payment method
+	// Retrieve payment method configuration
 	paymentConfig, err := l.svcCtx.PaymentModel.FindOne(l.ctx, orderInfo.PaymentId)
 	if err != nil {
-		l.Logger.Error("[Purchase] Database query error", logger.Field("error", err.Error()), logger.Field("payment", orderInfo.Method))
+		l.Logger.Error("[PurchaseCheckout] Database query error", logger.Field("error", err.Error()), logger.Field("payment", orderInfo.Method))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find payment method error: %v", err.Error())
 	}
+	// Route to appropriate payment handler based on payment platform
 	switch paymentPlatform.ParsePlatform(orderInfo.Method) {
 	case paymentPlatform.EPay:
+		// Process EPay payment - generates payment URL for redirect
 		url, err := l.epayPayment(paymentConfig, orderInfo, req.ReturnUrl)
 		if err != nil {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "epayPayment error: %v", err.Error())
 		}
 		resp = &types.CheckoutOrderResponse{
 			CheckoutUrl: url,
-			Type:        "url",
+			Type:        "url", // Client should redirect to URL
 		}
+
 	case paymentPlatform.Stripe:
+		// Process Stripe payment - creates payment sheet for client-side processing
 		stripePayment, err := l.stripePayment(paymentConfig.Config, orderInfo, "")
 		if err != nil {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "stripePayment error: %v", err.Error())
 		}
 		resp = &types.CheckoutOrderResponse{
-			Type:   "stripe",
+			Type:   "stripe", // Client should use Stripe SDK
 			Stripe: stripePayment,
 		}
+
 	case paymentPlatform.AlipayF2F:
+		// Process Alipay Face-to-Face payment - generates QR code
 		url, err := l.alipayF2fPayment(paymentConfig, orderInfo)
 		if err != nil {
-			l.Errorw("[CheckoutOrderLogic] alipayF2fPayment error", logger.Field("error", err.Error()))
+			l.Errorw("[PurchaseCheckout] alipayF2fPayment error", logger.Field("error", err.Error()))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "alipayF2fPayment error: %v", err.Error())
 		}
 		resp = &types.CheckoutOrderResponse{
-			Type:        "qr",
+			Type:        "qr", // Client should display QR code
 			CheckoutUrl: url,
 		}
+
 	case paymentPlatform.Balance:
+		// Process balance payment - validate user and process payment immediately
 		if orderInfo.UserId == 0 {
-			l.Errorw("[CheckoutOrderLogic] user not found", logger.Field("userId", orderInfo.UserId))
+			l.Errorw("[PurchaseCheckout] user not found", logger.Field("userId", orderInfo.UserId))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserNotExist), "user not found")
 		}
-		// find user
+
+		// Retrieve user information for balance validation
 		userInfo, err := l.svcCtx.UserModel.FindOne(l.ctx, orderInfo.UserId)
 		if err != nil {
-			l.Errorw("[CheckoutOrderLogic] FindOne User error", logger.Field("error", err.Error()))
+			l.Errorw("[PurchaseCheckout] FindOne User error", logger.Field("error", err.Error()))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "FindOne error: %s", err.Error())
 		}
 
-		// balance
+		// Process balance payment with gift amount priority logic
 		if err = l.balancePayment(userInfo, orderInfo); err != nil {
 			return nil, err
 		}
 		resp = &types.CheckoutOrderResponse{
-			Type: "balance",
+			Type: "balance", // Payment completed immediately
 		}
 
 	default:
-		l.Errorw("[CheckoutOrderLogic] payment method not found", logger.Field("method", orderInfo.Method))
+		l.Errorw("[PurchaseCheckout] payment method not found", logger.Field("method", orderInfo.Method))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "payment method not found")
 	}
 	return
 }
 
-// alipay f2f payment
+// alipayF2fPayment processes Alipay Face-to-Face payment by generating a QR code
+// It handles currency conversion and creates a pre-payment trade for QR code scanning
 func (l *PurchaseCheckoutLogic) alipayF2fPayment(pay *payment.Payment, info *order.Order) (string, error) {
+	// Parse Alipay F2F configuration from payment settings
 	f2FConfig := payment.AlipayF2FConfig{}
 	if err := json.Unmarshal([]byte(pay.Config), &f2FConfig); err != nil {
-		l.Errorw("[PurchaseCheckoutLogic] Unmarshal error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] Unmarshal Alipay config error", logger.Field("error", err.Error()))
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "Unmarshal error: %s", err.Error())
 	}
+
+	// Build notification URL for payment status callbacks
 	notifyUrl := ""
 	if pay.Domain != "" {
 		notifyUrl = pay.Domain + "/v1/notify/" + pay.Platform + "/" + pay.Token
@@ -135,6 +154,8 @@ func (l *PurchaseCheckoutLogic) alipayF2fPayment(pay *payment.Payment, info *ord
 		}
 		notifyUrl = "https://" + host + "/v1/notify/" + pay.Platform + "/" + pay.Token
 	}
+
+	// Initialize Alipay client with configuration
 	client := alipay.NewClient(alipay.Config{
 		AppId:       f2FConfig.AppId,
 		PrivateKey:  f2FConfig.PrivateKey,
@@ -142,46 +163,53 @@ func (l *PurchaseCheckoutLogic) alipayF2fPayment(pay *payment.Payment, info *ord
 		InvoiceName: f2FConfig.InvoiceName,
 		NotifyURL:   notifyUrl,
 	})
-	// Calculate the amount with exchange rate
+
+	// Convert order amount to CNY using current exchange rate
 	amount, err := l.queryExchangeRate("CNY", info.Amount)
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] queryExchangeRate error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] queryExchangeRate error", logger.Field("error", err.Error()))
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "queryExchangeRate error: %s", err.Error())
 	}
-	convertAmount := int64(amount * 100)
-	// create payment
+	convertAmount := int64(amount * 100) // Convert to cents for API
+
+	// Create pre-payment trade and generate QR code
 	QRCode, err := client.PreCreateTrade(l.ctx, alipay.Order{
 		OrderNo: info.OrderNo,
 		Amount:  convertAmount,
 	})
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] PreCreateTrade error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] PreCreateTrade error", logger.Field("error", err.Error()))
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "PreCreateTrade error: %s", err.Error())
 	}
 	return QRCode, nil
 }
 
-// Stripe Payment
+// stripePayment processes Stripe payment by creating a payment sheet
+// It supports various payment methods including WeChat Pay and Alipay through Stripe
 func (l *PurchaseCheckoutLogic) stripePayment(config string, info *order.Order, identifier string) (*types.StripePayment, error) {
-	// stripe WeChat pay or stripe alipay
+	// Parse Stripe configuration from payment settings
 	stripeConfig := payment.StripeConfig{}
 	if err := json.Unmarshal([]byte(config), &stripeConfig); err != nil {
-		l.Errorw("[CheckoutOrderLogic] Unmarshal error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] Unmarshal Stripe config error", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "Unmarshal error: %s", err.Error())
 	}
+
+	// Initialize Stripe client with API credentials
 	client := stripe.NewClient(stripe.Config{
 		SecretKey:     stripeConfig.SecretKey,
 		PublicKey:     stripeConfig.PublicKey,
 		WebhookSecret: stripeConfig.WebhookSecret,
 	})
-	// Calculate the amount with exchange rate
+
+	// Convert order amount to CNY using current exchange rate
 	amount, err := l.queryExchangeRate("CNY", info.Amount)
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] queryExchangeRate error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] queryExchangeRate error", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "queryExchangeRate error: %s", err.Error())
 	}
-	convertAmount := int64(amount * 100)
-	// create payment
+	convertAmount := int64(amount * 100) // Convert to cents for Stripe API
+
+	// Create Stripe payment sheet for client-side processing
 	result, err := client.CreatePaymentSheet(&stripe.Order{
 		OrderNo:   info.OrderNo,
 		Subscribe: strconv.FormatInt(info.SubscribeId, 10),
@@ -193,37 +221,47 @@ func (l *PurchaseCheckoutLogic) stripePayment(config string, info *order.Order,
 			Email: identifier,
 		})
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] CreatePaymentSheet error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] CreatePaymentSheet error", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "CreatePaymentSheet error: %s", err.Error())
 	}
-	tradeNo := result.TradeNo
+
+	// Prepare response data for client-side Stripe integration
 	stripePayment := &types.StripePayment{
 		PublishableKey: stripeConfig.PublicKey,
 		ClientSecret:   result.ClientSecret,
 		Method:         stripeConfig.Payment,
 	}
-	// save payment
-	info.TradeNo = tradeNo
+
+	// Save Stripe trade number to order for tracking
+	info.TradeNo = result.TradeNo
 	err = l.svcCtx.OrderModel.Update(l.ctx, info)
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] Update error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] Update order error", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Update error: %s", err.Error())
 	}
 	return stripePayment, nil
 }
 
+// epayPayment processes EPay payment by generating a payment URL for redirect
+// It handles currency conversion and creates a payment URL for external payment processing
 func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order.Order, returnUrl string) (string, error) {
+	// Parse EPay configuration from payment settings
 	epayConfig := payment.EPayConfig{}
 	if err := json.Unmarshal([]byte(config.Config), &epayConfig); err != nil {
-		l.Errorw("[CheckoutOrderLogic] Unmarshal error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] Unmarshal EPay config error", logger.Field("error", err.Error()))
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "Unmarshal error: %s", err.Error())
 	}
+
+	// Initialize EPay client with merchant credentials
 	client := epay.NewClient(epayConfig.Pid, epayConfig.Url, epayConfig.Key)
-	// Calculate the amount with exchange rate
+
+	// Convert order amount to CNY using current exchange rate
 	amount, err := l.queryExchangeRate("CNY", info.Amount)
 	if err != nil {
 		return "", err
 	}
+
+	// Build notification URL for payment status callbacks
 	notifyUrl := ""
 	if config.Domain != "" {
 		notifyUrl = config.Domain + "/v1/notify/" + config.Platform + "/" + config.Token
@@ -234,7 +272,8 @@ func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order
 		}
 		notifyUrl = "https://" + host + "/v1/notify/" + config.Platform + "/" + config.Token
 	}
-	// create payment
+
+	// Create payment URL for user redirection
 	url := client.CreatePayUrl(epay.Order{
 		Name:      l.svcCtx.Config.Site.SiteName,
 		Amount:    amount,
@@ -246,26 +285,34 @@ func (l *PurchaseCheckoutLogic) epayPayment(config *payment.Payment, info *order
 	return url, nil
 }
 
-// Query exchange rate
+// queryExchangeRate converts the order amount from system currency to target currency
+// It retrieves the current exchange rate and performs currency conversion if needed
 func (l *PurchaseCheckoutLogic) queryExchangeRate(to string, src int64) (amount float64, err error) {
+	// Convert cents to decimal amount
 	amount = float64(src) / float64(100)
-	// query system currency
+
+	// Retrieve system currency configuration
 	currency, err := l.svcCtx.SystemModel.GetCurrencyConfig(l.ctx)
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] GetCurrencyConfig error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] GetCurrencyConfig error", logger.Field("error", err.Error()))
 		return 0, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "GetCurrencyConfig error: %s", err.Error())
 	}
+
+	// Parse currency configuration
 	configs := struct {
 		CurrencyUnit   string
 		CurrencySymbol string
 		AccessKey      string
 	}{}
 	tool.SystemConfigSliceReflectToStruct(currency, &configs)
+
+	// Skip conversion if no exchange rate API key configured
 	if configs.AccessKey == "" {
 		return amount, nil
 	}
+
+	// Convert currency if system currency differs from target currency
 	if configs.CurrencyUnit != to {
-		// query exchange rate
 		result, err := exchangeRate.GetExchangeRete(configs.CurrencyUnit, to, configs.AccessKey, 1)
 		if err != nil {
 			return 0, err
@@ -275,71 +322,123 @@ func (l *PurchaseCheckoutLogic) queryExchangeRate(to string, src int64) (amount
 	return amount, nil
 }
 
-// Balance payment
+// balancePayment processes balance payment with gift amount priority logic
+// It prioritizes using gift amount first, then regular balance, and creates proper audit logs
 func (l *PurchaseCheckoutLogic) balancePayment(u *user.User, o *order.Order) error {
+	if o.Amount == 0 {
+		// No payment required for zero-amount orders
+		return nil
+	}
+
 	var userInfo user.User
 	err := l.svcCtx.UserModel.Transaction(l.ctx, func(db *gorm.DB) error {
+		// Retrieve latest user information with row-level locking
 		err := db.Model(&user.User{}).Where("id = ?", u.Id).First(&userInfo).Error
 		if err != nil {
 			return err
 		}
 
-		if o.GiftAmount != 0 {
-			if userInfo.GiftAmount < o.GiftAmount {
-				return errors.Wrapf(xerr.NewErrCode(xerr.InsufficientBalance), "Insufficient gift balance")
-			}
-			// deduct gift amount
-			userInfo.GiftAmount -= o.GiftAmount
+		// Check if user has sufficient total balance (regular + gift)
+		totalAvailable := userInfo.Balance + userInfo.GiftAmount
+		if totalAvailable < o.Amount {
+			return errors.Wrapf(xerr.NewErrCode(xerr.InsufficientBalance),
+				"Insufficient balance: required %d, available %d", o.Amount, totalAvailable)
 		}
 
-		if userInfo.Balance < o.Amount {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InsufficientBalance), "Insufficient balance")
-		}
-		// deduct balance
-		userInfo.Balance -= o.Amount
+		// Calculate payment distribution: prioritize gift amount first
+		var giftUsed, balanceUsed int64
+		remainingAmount := o.Amount
 
-		userInfo.GiftAmount -= o.GiftAmount
+		if userInfo.GiftAmount >= remainingAmount {
+			// Gift amount covers the entire payment
+			giftUsed = remainingAmount
+			balanceUsed = 0
+		} else {
+			// Use all available gift amount, then regular balance
+			giftUsed = userInfo.GiftAmount
+			balanceUsed = remainingAmount - giftUsed
+		}
+
+		// Update user balances
+		userInfo.GiftAmount -= giftUsed
+		userInfo.Balance -= balanceUsed
+
+		// Save updated user information
 		err = l.svcCtx.UserModel.Update(l.ctx, &userInfo)
 		if err != nil {
 			return err
 		}
-		// create balance log
-		balanceLog := &user.BalanceLog{
-			Id:      0,
-			UserId:  u.Id,
-			Amount:  o.Amount,
-			Type:    3,
-			OrderId: o.Id,
-			Balance: userInfo.Balance,
+
+		// Create gift amount log if gift amount was used
+		if giftUsed > 0 {
+			giftLog := &user.GiftAmountLog{
+				UserId:          u.Id,
+				UserSubscribeId: 0, // Will be updated when subscription is created
+				OrderNo:         o.OrderNo,
+				Type:            2, // Type 2 represents gift amount decrease/usage
+				Amount:          giftUsed,
+				Balance:         userInfo.GiftAmount,
+				Remark:          "Purchase payment",
+			}
+			err = db.Create(giftLog).Error
+			if err != nil {
+				return err
+			}
 		}
-		err = db.Create(balanceLog).Error
+
+		// Create balance log if regular balance was used
+		if balanceUsed > 0 {
+			balanceLog := &user.BalanceLog{
+				UserId:  u.Id,
+				Amount:  balanceUsed,
+				Type:    3, // Type 3 represents payment deduction
+				OrderId: o.Id,
+				Balance: userInfo.Balance,
+			}
+			err = db.Create(balanceLog).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		// Store gift amount used in order for potential refund tracking
+		o.GiftAmount = giftUsed
+		err = l.svcCtx.OrderModel.Update(l.ctx, o)
 		if err != nil {
 			return err
 		}
-		return db.Model(&order.Order{}).Where("id = ?", o.Id).Updates(map[string]interface{}{
-			"status": 2, // 2 means paid
-		}).Error
+
+		// Mark order as paid (status = 2)
+		return l.svcCtx.OrderModel.UpdateOrderStatus(l.ctx, o.OrderNo, 2, db)
 	})
+
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] Transaction error", logger.Field("error", err.Error()), logger.Field("orderNo", o.OrderNo))
+		l.Errorw("[PurchaseCheckout] Balance payment transaction error",
+			logger.Field("error", err.Error()),
+			logger.Field("orderNo", o.OrderNo),
+			logger.Field("userId", u.Id))
 		return err
 	}
-	// create activity order task
+
+	// Enqueue order activation task for immediate processing
 	payload := queueType.ForthwithActivateOrderPayload{
 		OrderNo: o.OrderNo,
 	}
 	bytes, err := json.Marshal(payload)
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] Marshal error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] Marshal activation payload error", logger.Field("error", err.Error()))
 		return err
 	}
 
 	task := asynq.NewTask(queueType.ForthwithActivateOrder, bytes)
 	_, err = l.svcCtx.Queue.EnqueueContext(l.ctx, task)
 	if err != nil {
-		l.Errorw("[CheckoutOrderLogic] Enqueue error", logger.Field("error", err.Error()))
+		l.Errorw("[PurchaseCheckout] Enqueue activation task error", logger.Field("error", err.Error()))
 		return err
 	}
-	l.Logger.Info("[CheckoutOrderLogic] Enqueue success", logger.Field("orderNo", o.OrderNo))
+
+	l.Logger.Info("[PurchaseCheckout] Balance payment completed successfully",
+		logger.Field("orderNo", o.OrderNo),
+		logger.Field("userId", u.Id))
 	return nil
 }

internal/logic/public/portal/purchaseLogic.go

@@ -93,7 +93,6 @@ func (l *PurchaseLogic) Purchase(req *types.PortalPurchaseRequest) (resp *types.
 	}
 	// Calculate the handling fee
 	amount -= couponAmount
-	var deductionAmount int64
 	// find payment method
 	paymentConfig, err := l.svcCtx.PaymentModel.FindOne(l.ctx, req.Payment)
 	if err != nil {
@@ -118,7 +117,7 @@ func (l *PurchaseLogic) Purchase(req *types.PortalPurchaseRequest) (resp *types.
 		Price:          price,
 		Amount:         amount,
 		Discount:       discountAmount,
-		GiftAmount:     deductionAmount,
+		GiftAmount:     0,
 		Coupon:         req.Coupon,
 		CouponDiscount: couponAmount,
 		PaymentId:      req.Payment,

internal/logic/public/user/calculateRemainingAmount.go

@@ -38,6 +38,7 @@ func CalculateRemainingAmount(ctx context.Context, svcCtx *svc.ServiceContext, u
 	orderQuantity := orderDetails.Quantity
 	// Calculate Order Amount
 	orderAmount := orderDetails.Amount + orderDetails.GiftAmount
+
 	if len(orderDetails.SubOrders) > 0 {
 		for _, subOrder := range orderDetails.SubOrders {
 			if subOrder.Status == 2 || subOrder.Status == 5 {
@@ -47,7 +48,7 @@ func CalculateRemainingAmount(ctx context.Context, svcCtx *svc.ServiceContext, u
 		}
 	}
 	// Calculate Remaining Amount
-	remainingAmount := deduction.CalculateRemainingAmount(
+	remainingAmount, err := deduction.CalculateRemainingAmount(
 		deduction.Subscribe{
 			StartTime:      userSubscribe.StartTime,
 			ExpireTime:     userSubscribe.ExpireTime,
@@ -64,5 +65,8 @@ func CalculateRemainingAmount(ctx context.Context, svcCtx *svc.ServiceContext, u
 			Quantity: orderQuantity,
 		},
 	)
+	if err != nil {
+		return 0, errors.Wrapf(xerr.NewErrCode(500), "CalculateRemainingAmount failed, userSubscribeId: %d, err: %v", userSubscribeId, err)
+	}
 	return remainingAmount, nil
 }

internal/logic/public/user/unsubscribeLogic.go

@@ -21,7 +21,7 @@ type UnsubscribeLogic struct {
 	svcCtx *svc.ServiceContext
 }
 
-// NewUnsubscribeLogic Unsubscribe
+// NewUnsubscribeLogic creates a new instance of UnsubscribeLogic for handling subscription cancellation
 func NewUnsubscribeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UnsubscribeLogic {
 	return &UnsubscribeLogic{
 		Logger: logger.WithContext(ctx),
@@ -30,39 +30,90 @@ func NewUnsubscribeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Unsub
 	}
 }
 
+// Unsubscribe handles the subscription cancellation process with proper refund distribution
+// It prioritizes refunding to gift amount for balance-paid orders, then to regular balance
 func (l *UnsubscribeLogic) Unsubscribe(req *types.UnsubscribeRequest) error {
 	u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
 	if !ok {
 		logger.Error("current user is not found in context")
 		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
+	// Calculate the remaining amount to refund based on unused subscription time/traffic
 	remainingAmount, err := CalculateRemainingAmount(l.ctx, l.svcCtx, req.Id)
 	if err != nil {
 		return err
 	}
-	// update user subscribe
+
+	// Process unsubscription in a database transaction to ensure data consistency
 	err = l.svcCtx.UserModel.Transaction(l.ctx, func(db *gorm.DB) error {
+		// Find and update subscription status to cancelled (status = 4)
 		var userSub user.Subscribe
-		if err := db.Model(&user.Subscribe{}).Where("id = ?", req.Id).First(&userSub).Error; err != nil {
+		if err = db.Model(&user.Subscribe{}).Where("id = ?", req.Id).First(&userSub).Error; err != nil {
 			return err
 		}
-		userSub.Status = 4
-		if err := l.svcCtx.UserModel.UpdateSubscribe(l.ctx, &userSub); err != nil {
+		userSub.Status = 4 // Set status to cancelled
+		if err = l.svcCtx.UserModel.UpdateSubscribe(l.ctx, &userSub); err != nil {
 			return err
 		}
-		balance := remainingAmount + u.Balance
-		// insert deduction log
-		balanceLog := user.BalanceLog{
-			UserId:  userSub.UserId,
-			OrderId: userSub.OrderId,
-			Amount:  remainingAmount,
-			Type:    4,
-			Balance: balance,
-		}
-		if err := db.Model(&user.BalanceLog{}).Create(&balanceLog).Error; err != nil {
+
+		// Query the original order information to determine refund strategy
+		orderInfo, err := l.svcCtx.OrderModel.FindOne(l.ctx, userSub.OrderId)
+		if err != nil {
 			return err
 		}
-		// update user balance
+		// Calculate refund distribution based on payment method and gift amount priority
+		var balance, gift int64
+		if orderInfo.Method == "balance" {
+			// For balance-paid orders, prioritize refunding to gift amount first
+			if orderInfo.GiftAmount >= remainingAmount {
+				// Gift amount covers the entire refund - refund all to gift balance
+				gift = remainingAmount
+				balance = u.Balance // Regular balance remains unchanged
+			} else {
+				// Gift amount insufficient - refund to gift first, remainder to regular balance
+				gift = orderInfo.GiftAmount
+				balance = u.Balance + (remainingAmount - orderInfo.GiftAmount)
+			}
+		} else {
+			// For non-balance payment orders, refund entirely to regular balance
+			balance = remainingAmount + u.Balance
+			gift = 0
+		}
+
+		// Create balance log entry only if there's an actual regular balance refund
+		balanceRefundAmount := balance - u.Balance
+		if balanceRefundAmount > 0 {
+			balanceLog := user.BalanceLog{
+				UserId:  userSub.UserId,
+				OrderId: userSub.OrderId,
+				Amount:  balanceRefundAmount,
+				Type:    4, // Type 4 represents refund transaction
+				Balance: balance,
+			}
+			if err := db.Model(&user.BalanceLog{}).Create(&balanceLog).Error; err != nil {
+				return err
+			}
+		}
+
+		// Create gift amount log entry if there's a gift balance refund
+		if gift > 0 {
+			giftLog := user.GiftAmountLog{
+				UserId:          userSub.UserId,
+				UserSubscribeId: userSub.Id,
+				OrderNo:         orderInfo.OrderNo,
+				Type:            1, // Type 1 represents gift amount increase
+				Amount:          gift,
+				Balance:         u.GiftAmount + gift,
+				Remark:          "Unsubscribe refund",
+			}
+			if err := db.Model(&user.GiftAmountLog{}).Create(&giftLog).Error; err != nil {
+				return err
+			}
+			// Update user's gift amount
+			u.GiftAmount += gift
+		}
+
+		// Update user's regular balance and save changes to database
 		u.Balance = balance
 		return l.svcCtx.UserModel.Update(l.ctx, u)
 	})