增加系统配置接口

service/media/media_service.go

@@ -339,28 +339,31 @@ func DealMediaInfo(media *mediaService.MediaDTO, isLogin bool, templateUserId in
 		productType = ""
 	}
 	var packageList []productService.MerchantProductDTO
+	var permissionIds []int
+	if len(permissions) > 0 {
+		for _, permission := range permissions {
+			permissionIds = append(permissionIds, permission.PermissionId)
+		}
+		//单品不存在的话查套餐
+		packageList, err = productService.GetProductListBySourceIds(permissionIds, "package")
+		if err != nil {
+			logger.Error("获取套餐列表失败:%v", err)
+		}
+	}
 	product, pdErr := productService.GetProductBySourceId(media.MediaId, productType)
 	if pdErr != nil {
-		var permissionIds []int
-		if len(permissions) > 0 {
-			for _, permission := range permissions {
-				permissionIds = append(permissionIds, permission.PermissionId)
-			}
-			//单品不存在的话查套餐
-			packageList, err = productService.GetProductListBySourceIds(permissionIds, "package")
-			if err != nil || len(packageList) == 0 {
-				logger.Error("获取套餐列表失败:%v", err)
-				media.Price = defaultProductPrice
-				media.IsFree = true
-				media.IsSubscribe = false
-				media.IsPackage = false
-			} else {
-				media.Price = defaultProductPrice
-				media.IsFree = false
-				media.IsSubscribe = false
-				media.IsPackage = true
-				media.ProductId = packageList[0].Id
-			}
+		if len(packageList) == 0 {
+			logger.Error("获取套餐列表失败:%v", err)
+			media.Price = defaultProductPrice
+			media.IsFree = true
+			media.IsSubscribe = false
+			media.IsPackage = false
+		} else {
+			media.Price = defaultProductPrice
+			media.IsFree = false
+			media.IsSubscribe = false
+			media.IsPackage = true
+			media.ProductId = packageList[0].Id
 		}
 	} else {
 		media.Price = product.Price

service/report/report_service.go

@@ -333,18 +333,8 @@ func DealReportInfo(report *reportService.ReportDTO, isLogin bool, userId int) (
 		}
 		//单品不存在的话查套餐
 		packageList, err = productService.GetProductListBySourceIds(permissionIds, "package")
-		if err != nil || len(packageList) == 0 {
+		if err != nil {
 			logger.Error("获取套餐列表失败:%v", err)
-			report.Price = defaultProductPrice
-			report.IsFree = true
-			report.IsSubscribe = false
-			report.IsPackage = false
-		} else {
-			report.Price = packageList[0].Price
-			report.IsFree = false
-			report.IsSubscribe = false
-			report.IsPackage = true
-			report.ProductId = packageList[0].Id
 		}
 	}
 	if pdErr != nil {