过滤下架产品

domian/report/report_service.go

@@ -10,7 +10,6 @@ import (
 	stringUtils "eta/eta_mini_ht_api/common/utils/string"
 	configService "eta/eta_mini_ht_api/domian/config"
 	analystService "eta/eta_mini_ht_api/domian/financial_analyst"
-	merchantService "eta/eta_mini_ht_api/domian/merchant"
 	messageDomian "eta/eta_mini_ht_api/domian/message"
 	userService "eta/eta_mini_ht_api/domian/user"
 	"eta/eta_mini_ht_api/models"
@@ -20,6 +19,7 @@ import (
 	etaDao "eta/eta_mini_ht_api/models/eta"
 	"eta/eta_mini_ht_api/models/ht"
 	mediaDao "eta/eta_mini_ht_api/models/image"
+	merchantDao "eta/eta_mini_ht_api/models/merchant"
 	"eta/eta_mini_ht_api/models/message"
 	messageDao "eta/eta_mini_ht_api/models/message"
 	reportDao "eta/eta_mini_ht_api/models/report"
@@ -874,17 +874,17 @@ func GetTotalPageCountByPermissionIds(permissionIds []int, riskLevel string) (to
 		ids["HT"] = htOrgIds
 	}
 	//获取一下下架的报告产品
-	var offSaleProducts []merchantService.MerchantProductDTO
+	var offSaleProducts []merchantDao.MerchantProduct
 	var disCardReportIds []int
-	offSaleProducts, err = merchantService.GetOffSaleProducts([]string{"report", "package"})
+	offSaleProducts, err = merchantDao.GetOffSaleProducts([]merchantDao.MerchantProductType{merchantDao.Report, merchantDao.Package})
 	if err != nil {
 		logger.Error("获取下架的报告产品失败:%v", err)
 	}
 	for _, product := range offSaleProducts {
 		if product.Type == "package" {
-			permission, permissionErr := permissionDao.PermissionsByPermissionId(product.SourceId)
+			permission, permissionErr := permissionDao.PermissionsByPermissionId(product.SourceID)
 			if permissionErr != nil {
-				logger.Error("获取权限信息失败[permissionId:%d]", product.SourceId)
+				logger.Error("获取权限信息失败[permissionId:%d]", product.SourceID)
 				continue
 			}
 			classifyIds, classifyErr := permissionDao.GetClassifyIdsByPermissionIds([]int{permission.PermissionId})
@@ -898,7 +898,7 @@ func GetTotalPageCountByPermissionIds(permissionIds []int, riskLevel string) (to
 
 		}
 		if product.Type == "report" {
-			disCardReportIds = append(disCardReportIds, product.SourceId)
+			disCardReportIds = append(disCardReportIds, product.SourceID)
 		}
 	}
 	total, latestId, err = reportDao.GetMaxIdByPermissionIds(ids, disCardReportIds)

models/merchant/merchant_product.go

@@ -235,4 +235,5 @@ func GetOffSaleProducts(query []MerchantProductType) (list []MerchantProduct, er
 	db := models.Main()
 	err = db.Select(detailColumns).Where(" deleted =? and  type  in ?  and sale_status = ? ", query, false, OffSale).Find(&list).Error
 	return
+
 }