修复缓存

internal/logic/public/order/closeOrderLogic.go

@@ -131,9 +131,8 @@ func (l *CloseOrderLogic) CloseOrder(req *types.CloseOrderRequest) error {
 				)
 				return err
 			}
-			// update user cache
-			return l.svcCtx.UserModel.UpdateUserCache(l.ctx, userInfo)
 		}
+		// Note: user cache will be updated after transaction commits
 		if sub.Inventory != -1 {
 			sub.Inventory++
 			if e := l.svcCtx.SubscribeModel.Update(l.ctx, sub, tx); e != nil {
@@ -151,6 +150,19 @@ func (l *CloseOrderLogic) CloseOrder(req *types.CloseOrderRequest) error {
 		logger.Errorf("[CloseOrder] Transaction failed: %v", err.Error())
 		return err
 	}
+
+	// Update user cache after transaction commits successfully
+	if orderInfo.GiftAmount > 0 && orderInfo.UserId != 0 {
+		if userInfo, findErr := l.svcCtx.UserModel.FindOne(l.ctx, orderInfo.UserId); findErr == nil {
+			if clearErr := l.svcCtx.UserModel.ClearUserCache(l.ctx, userInfo); clearErr != nil {
+				l.Errorw("[CloseOrder] failed to clear user cache",
+					logger.Field("error", clearErr.Error()),
+					logger.Field("user_id", orderInfo.UserId),
+				)
+			}
+		}
+	}
+
 	return nil
 }
 

internal/logic/public/order/preCreateOrderLogic.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"math"
+	"time"
 
 	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/order"
@@ -108,6 +109,23 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		}
 	}
 
+	// check new user only restriction
+	if !isSingleModeRenewal && sub.NewUserOnly != nil && *sub.NewUserOnly {
+		if time.Since(u.CreatedAt) > 24*time.Hour {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "not a new user")
+		}
+		var historyCount int64
+		if e := l.svcCtx.DB.Model(&order.Order{}).
+			Where("user_id = ? AND subscribe_id = ? AND type = 1 AND status IN ?",
+				u.Id, targetSubscribeID, []uint8{2, 5}).
+			Count(&historyCount).Error; e != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "check new user purchase history error: %v", e.Error())
+		}
+		if historyCount >= 1 {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "already purchased new user plan")
+		}
+	}
+
 	var discount float64 = 1
 	if sub.Discount != "" {
 		var dis []types.SubscribeDiscount

internal/logic/public/order/purchaseLogic.go

@@ -270,6 +270,23 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 			}
 		}
 
+		// check new user only restriction inside transaction to prevent race condition
+		if orderInfo.Type == 1 && sub.NewUserOnly != nil && *sub.NewUserOnly {
+			if time.Since(u.CreatedAt) > 24*time.Hour {
+				return errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "not a new user")
+			}
+			var historyCount int64
+			if e := db.Model(&order.Order{}).
+				Where("user_id = ? AND subscribe_id = ? AND type = 1 AND status IN ?",
+					u.Id, targetSubscribeID, []int{2, 5}).
+				Count(&historyCount).Error; e != nil {
+				return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "check new user purchase history error: %v", e.Error())
+			}
+			if historyCount >= 1 {
+				return errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "already purchased new user plan")
+			}
+		}
+
 		// update user gift amount and create deduction record
 		if orderInfo.GiftAmount > 0 {
 			// deduct gift amount from user
@@ -319,7 +336,11 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 	})
 	if err != nil {
 		l.Errorw("[Purchase] Database insert error", logger.Field("error", err.Error()), logger.Field("orderInfo", orderInfo))
-
+		// Propagate business errors (e.g. SubscribeNewUserOnly, SubscribeQuotaLimit) directly.
+		var codeErr *xerr.CodeError
+		if errors.As(err, &codeErr) {
+			return nil, err
+		}
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert order error: %v", err.Error())
 	}
 	// Deferred task