From 6f1a46fa072fbd95dd4fd166f62ce7b7265311fe Mon Sep 17 00:00:00 2001
From: sxy <3187870250@qq.com>
Date: Wed, 11 Jun 2025 11:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=97=E9=A4=90=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/dao/bundleDao.go | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/internal/dao/bundleDao.go b/internal/dao/bundleDao.go
index 29e30c7..214d7cf 100644
--- a/internal/dao/bundleDao.go
+++ b/internal/dao/bundleDao.go
@@ -158,24 +158,17 @@ func BundleListV2(req *bundle.BundleListRequest) (res *bundle.BundleListResponse
 		query = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
 	}
 
-	if err = query.Find(&bundles).Error; err != nil {
+	if err = query.Find(&bundles).Preload("BundleToValueAddService").Error; err != nil {
 		return res, commonErr.ReturnError(err, msg.ErrorGetBundleList, "获取套餐列表失败: ")
 	}
 	if bundles != nil && len(bundles) > 0 {
 		for _, bundleProfile := range bundles {
 			selectValueAddService := make([]*bundle.SelectValueAddService, 0)
-			// 通过中间表拼接增值服务数据
-			if bundleProfile.UUID != "" {
-				bundleToValueAddServices, err := GetBundleToValueAddServiceByBundleUuid(bundleProfile.UUID)
-				if err != nil {
-					return res, commonErr.ReturnError(err, msg.ErrorGetBundleInfo, "获取增值服务信息失败: ")
-				}
-				for _, v := range bundleToValueAddServices {
-					valueAddDetail, _ := ValueAddServiceDetail(v.ValueUid)
+			if bundleProfile.BundleToValueAddService != nil {
+				for _, v := range bundleProfile.BundleToValueAddService {
 					selectValueAddService = append(selectValueAddService, &bundle.SelectValueAddService{
 						ValueAddUuid: v.ValueUid,
 						IsDisplay:    v.IsDisplay,
-						ServiceName:  valueAddDetail.ServiceName,
 					})
 				}
 			}