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, }) } }