同步历史版本代码

internal/logic/public/order/preCreateOrderLogic.go

@@ -3,6 +3,7 @@ package order
 import (
 	"context"
 	"encoding/json"
+	"math"
 
 	"github.com/perfect-panel/server/internal/model/order"
 	"github.com/perfect-panel/server/pkg/tool"
@@ -82,7 +83,7 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 	}
 	price := sub.UnitPrice * req.Quantity
 
-	amount := int64(float64(price) * discount)
+	amount := int64(math.Round(float64(price) * discount))
 	discountAmount := price - amount
 	var couponAmount int64
 	if req.Coupon != "" {

internal/logic/public/order/purchaseLogic.go

@@ -3,6 +3,7 @@ package order
 import (
 	"context"
 	"encoding/json"
+	"math"
 	"time"
 
 	"github.com/perfect-panel/server/internal/model/log"
@@ -72,7 +73,18 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 	}
 	if l.svcCtx.Config.Subscribe.SingleModel {
 		if len(userSub) > 0 {
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserSubscribeExist), "user has subscription")
+			// Only block if user has a paid subscription (OrderId > 0)
+			// Allow purchase if user only has gift subscriptions
+			hasPaidSubscription := false
+			for _, s := range userSub {
+				if s.OrderId > 0 {
+					hasPaidSubscription = true
+					break
+				}
+			}
+			if hasPaidSubscription {
+				return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserSubscribeExist), "user has subscription")
+			}
 		}
 	}
 
@@ -101,7 +113,7 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 	}
 	price := sub.UnitPrice * req.Quantity
 	// discount amount
-	amount := int64(float64(price) * discount)
+	amount := int64(math.Round(float64(price) * discount))
 	discountAmount := price - amount
 
 	// Validate amount to prevent overflow

internal/logic/public/order/queryOrderListLogic.go

@@ -35,7 +35,7 @@ func (l *QueryOrderListLogic) QueryOrderList(req *types.QueryOrderListRequest) (
 		logger.Error("current user is not found in context")
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
-	total, data, err := l.svcCtx.OrderModel.QueryOrderListByPage(l.ctx, req.Page, req.Size, 0, u.Id, 0, "")
+	total, data, err := l.svcCtx.OrderModel.QueryOrderListByPage(l.ctx, req.Page, req.Size, uint8(req.Status), u.Id, 0, req.Search)
 	if err != nil {
 		l.Errorw("[QueryOrderListLogic] Query order list failed", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query order list failed")

internal/logic/public/order/renewalLogic.go

@@ -3,6 +3,7 @@ package order
 import (
 	"context"
 	"encoding/json"
+	"math"
 	"time"
 
 	"github.com/perfect-panel/server/internal/model/log"
@@ -79,7 +80,7 @@ func (l *RenewalLogic) Renewal(req *types.RenewalOrderRequest) (resp *types.Rene
 		discount = getDiscount(dis, req.Quantity)
 	}
 	price := sub.UnitPrice * req.Quantity
-	amount := int64(float64(price) * discount)
+	amount := int64(math.Round(float64(price) * discount))
 	discountAmount := price - amount
 
 	// Validate amount to prevent overflow