产品列表

service/media/media_service.go

@@ -275,15 +275,6 @@ func GetMediaPageByAnalystId(mediaType string, pageInfo page.PageInfo, analystId
 	var wg sync.WaitGroup
 	wg.Add(len(list))
 	for i := 0; i < len(list); i++ {
-		//go func(media *mediaService.MediaDTO) {
-		//	defer wg.Done()
-		//	idStr := strings.Split(media.PermissionIDs, ",")
-		//	var ids []int
-		//	ids, err = stringUtils.StringToIntSlice(idStr)
-		//	if err != nil {
-		//		logger.Error("品种名称列表转换失败:%v", err)
-		//	}
-		//	media.PermissionNames = getMediaPermissionNames(ids)
 		go func(media *mediaService.MediaDTO) {
 			defer wg.Done()
 			idStr := strings.Split(media.PermissionIDs, ",")

service/product/product_service.go

@@ -1,12 +1,14 @@
 package product
 
 import (
+	"errors"
 	logger "eta/eta_mini_ht_api/common/component/log"
 	"eta/eta_mini_ht_api/common/exception"
 	"eta/eta_mini_ht_api/common/utils/page"
 	permissionService "eta/eta_mini_ht_api/domian/config"
 	merchantService "eta/eta_mini_ht_api/domian/merchant"
 	reportDomain "eta/eta_mini_ht_api/domian/report"
+	"eta/eta_mini_ht_api/domian/user"
 	"eta/eta_mini_ht_api/models/config"
 	"eta/eta_mini_ht_api/models/image"
 	"eta/eta_mini_ht_api/models/media"
@@ -15,12 +17,13 @@ import (
 	"eta/eta_mini_ht_api/service/order"
 	reportService "eta/eta_mini_ht_api/service/report"
 	"fmt"
+	"gorm.io/gorm"
 	"sync"
 	"time"
 )
 
 type ProductDTO struct {
-	Id              int      `json:"-"`
+	Id              int      `json:"id"`
 	Title           string   `json:"title"`
 	SourceTile      string   `json:"sourceTile"`
 	Abstract        string   `json:"abstract"`
@@ -305,8 +308,15 @@ func ProductList(productIds []int, templateUserId int, info page.PageInfo) (dtoL
 	for i := 0; i < len(dtoList); i++ {
 		go func(productDTO *ProductDTO) {
 			defer wg.Done()
-			//subscibe, err := user.GetUserSubscribe(productDTO.Id, templateUserId)
-			//if
+			subscibe, subErr := user.GetUserSubscribe(productDTO.Id, templateUserId)
+			if subErr != nil {
+				if errors.Is(subErr, gorm.ErrRecordNotFound) {
+					logger.Error("用户未订阅单品，productId:%v", productDTO.Id)
+					productDTO.IsSubscribe = false
+				}
+				logger.Error("获取用户订阅状态失败:%v", err)
+				productDTO.IsSubscribe = false
+			}
 		}(&dtoList[i])
 	}
 	return

service/report/report_service.go

@@ -301,6 +301,8 @@ func dealReportInfo(list []reportService.ReportDTO, isLogin bool, userId int) (r
 			} else {
 				report.CoverUrl = src
 			}
+			//套餐信息
+			
 			//查询产品信息
 			product, pdErr := productService.GetProductBySourceId(report.ReportID, productDao.Report)
 			if pdErr != nil {