internal/logic/public/order/purchaseLogic.go

@@ -236,12 +236,14 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		}
 	}
 	// query user is new purchase or renewal
-	// 注意：SingleModel 下 orderType 会被路由成 2（续费），但仍需正确判断是否首购以发佣金
-	isNew, err := l.svcCtx.OrderModel.IsUserEligibleForNewOrder(l.ctx, u.Id)
+	isNew := false
+	if orderType == 1 {
+		isNew, err = l.svcCtx.OrderModel.IsUserEligibleForNewOrder(l.ctx, u.Id)
 		if err != nil {
 			l.Errorw("[Purchase] Database query error", logger.Field("error", err.Error()), logger.Field("user_id", u.Id))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find user order error: %v", err.Error())
 		}
+	}
 	// create order
 	orderInfo := &order.Order{
 		UserId:             u.Id,

internal/model/user/device.go

@@ -41,7 +41,7 @@ func (m *customUserModel) QueryDevicePageList(ctx context.Context, userId, subsc
 	var list []*Device
 	var total int64
 	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
-		return conn.Model(&Device{}).Where("`user_id` = ?", userId).Count(&total).Limit(size).Offset((page - 1) * size).Find(&list).Error
+		return conn.Model(&Device{}).Where("`user_id` = ? and `subscribe_id` = ?", userId, subscribeId).Count(&total).Limit(size).Offset((page - 1) * size).Find(&list).Error
 	})
 	return list, total, err
 }

pkg/apiversion/version.go

@@ -54,7 +54,7 @@ func UseLatest(header string, threshold string) bool {
 		thresholdVersion, _ = Parse(DefaultThreshold)
 	}
 
-	return compare(currentVersion, thresholdVersion) >= 0
+	return compare(currentVersion, thresholdVersion) > 0
 }
 
 func compare(left Version, right Version) int {

queue/logic/traffic/trafficStatisticsLogic.go

@@ -3,13 +3,11 @@ package traffic
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"strings"
 	"time"
 
 	"github.com/perfect-panel/server/internal/model/node"
 	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/speedlimit"
 
 	"github.com/hibiken/asynq"
 	"github.com/perfect-panel/server/internal/model/traffic"
@@ -128,21 +126,6 @@ func (l *TrafficStatisticsLogic) ProcessTask(ctx context.Context, task *asynq.Ta
 				logger.Field("error", err.Error()),
 			)
 		}
-
-		// 写完流量后检查是否触发按量限速，若触发则清除节点缓存使限速立即生效
-		if planSub, planErr := l.svc.SubscribeModel.FindOne(ctx, sub.SubscribeId); planErr == nil &&
-			(planSub.SpeedLimit > 0 || planSub.TrafficLimit != "") {
-			throttle := speedlimit.Calculate(ctx, l.svc.DB, sub.UserId, sub.Id, planSub.SpeedLimit, planSub.TrafficLimit)
-			if throttle.IsThrottled {
-				cacheKey := fmt.Sprintf("%s%d", node.ServerUserListCacheKey, payload.ServerId)
-				if delErr := l.svc.Redis.Del(ctx, cacheKey).Err(); delErr != nil {
-					logger.WithContext(ctx).Error("[TrafficStatistics] Clear server user cache failed",
-						logger.Field("serverId", payload.ServerId),
-						logger.Field("error", delErr.Error()),
-					)
-				}
-			}
-		}
 	}
 	return nil
 }