f

app/main/api/internal/logic/agent/getagentmembershipproductconfiglogic.go

@@ -1,11 +1,13 @@
 package agent
 
 import (
-	"context"
+	"bdrp-server/app/main/api/internal/service"
 	"bdrp-server/app/main/model"
 	"bdrp-server/common/ctxdata"
 	"bdrp-server/common/xerr"
 	"bdrp-server/pkg/lzkit/lzUtils"
+	"context"
+	"time"
 
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
@@ -40,6 +42,9 @@ func (l *GetAgentMembershipProductConfigLogic) GetAgentMembershipProductConfig(r
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取会员用户报告配置，获取代理信息失败: %v", err)
 	}
+	if service.IsMembershipExpired(agentModel, time.Now()) {
+		return nil, errors.Wrapf(xerr.NewErrMsg("会员已过期"), "获取会员用户报告配置，会员已过期: agent_id=%d", agentModel.Id)
+	}
 	if agentModel.LevelName == "" {
 		agentModel.LevelName = model.AgentLeveNameNormal
 	}

app/main/api/internal/logic/agent/getagentproductconfiglogic.go

@@ -1,11 +1,13 @@
 package agent
 
 import (
-	"context"
+	"bdrp-server/app/main/api/internal/service"
 	"bdrp-server/app/main/model"
 	"bdrp-server/common/ctxdata"
 	"bdrp-server/common/xerr"
+	"context"
 	"math"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/mr"
@@ -104,6 +106,10 @@ func (l *GetAgentProductConfigLogic) GetAgentProductConfig() (resp *types.AgentP
 					cancel(findAncestorAgentErr)
 					return
 				}
+				if service.IsMembershipExpired(ancestorAgentModel, time.Now()) {
+					writer.Write(&agentProductConfig)
+					return
+				}
 				if ancestorAgentModel.LevelName == "" {
 					ancestorAgentModel.LevelName = model.AgentLeveNameNormal
 				}

app/main/api/internal/logic/agent/getagentrevenueinfologic.go

@@ -175,6 +175,11 @@ func calculateActiveReward(rewards []*model.AgentRewards) types.ActiveReward {
 	last30dStart := now.AddDate(0, 0, -30) // 近30天
 
 	for _, r := range rewards {
+		// 跳过已取消的奖励（退款取消）
+		if r.Status == 1 {
+			continue
+		}
+
 		createTime := r.CreateTime
 		amount := r.Amount
 
@@ -219,11 +224,12 @@ func addToPeriods(res *types.ActiveReward, amount float64, today, last7d, last30
 
 // 分类添加具体字段
 func addToData(data *types.ActiveRewardData, amount float64, t string) {
+	// 所有类型都累加到总奖励
+	data.NewActiveReward += amount
+
 	switch t {
 	case "withdraw":
 		data.SubWithdrawReward += amount
-	case "new_active":
-		data.NewActiveReward += amount
 	case "upgrade":
 		data.SubUpgradeReward += amount
 	case "promotion":

app/main/api/internal/logic/agent/saveagentmembershipuserconfiglogic.go

@@ -1,10 +1,12 @@
 package agent
 
 import (
-	"context"
+	"bdrp-server/app/main/api/internal/service"
 	"bdrp-server/app/main/model"
 	"bdrp-server/common/ctxdata"
 	"bdrp-server/common/xerr"
+	"context"
+	"time"
 
 	"github.com/pkg/errors"
 
@@ -37,6 +39,9 @@ func (l *SaveAgentMembershipUserConfigLogic) SaveAgentMembershipUserConfig(req *
 	if err != nil {
 		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "保存会员代理报告配置: %v", err)
 	}
+	if service.IsMembershipExpired(agentModel, time.Now()) {
+		return errors.Wrapf(xerr.NewErrMsg("会员已过期"), "保存会员代理报告配置，会员已过期: agent_id=%d", agentModel.Id)
+	}
 
 	var agentMembershipUserConfigModel *model.AgentMembershipUserConfig
 	agentMembershipUserConfigModel, err = l.svcCtx.AgentMembershipUserConfigModel.FindOneByAgentIdProductId(l.ctx, agentModel.Id, req.ProductID)