过滤下架产品

controllers/web_hook/htfutures_trade_controller.go

@@ -81,7 +81,7 @@ func (h *HTFuturesTradeController) InformRefundResult() {
 			productOrder, RefundErr := orderService.DealRefund(s.TradeOrderNo, orderService.RefundSuccess)
 			if RefundErr != nil {
 				logger.Error("退款订单处理失败: %v", err)
-				err = exception.NewWithException(exception.RefundDealFail, RefundErr.Error())
+				err = exception.NewWithException(exception.RefundDealFail, err.Error())
 				h.FailedResult("退款订单处理失败", result)
 				return
 			}

domian/media/media_service.go

@@ -167,7 +167,7 @@ func GetMediaPermissionMappingByPermissionIds(mediaType string, permissionIds []
 	disCardMediaIds = uniqueArray(disCardMediaIds)
 	//获取媒体中还包含上架套餐的id
 	if len(disCardMediaIds) > 0 {
-		mediaIdsSalePackage, _ := merchantDao.GetMediaOnSalePackageIds(disCardMediaIds, transProductMap[mediaType])
+		mediaIdsSalePackage, _ := merchantDao.GetMediaOnSalePackageIds(disCardMediaIds)
 		mediaIdsSaleProduct, _ := merchantDao.GetOnSaleMediaIds(disCardMediaIds, transProductMap[mediaType])
 		showReportMap := make(map[int]bool)
 		disCardMap := make(map[int]bool)
@@ -258,7 +258,7 @@ func GetAnalystMediaPermissionMappingByPermissionIds(mediaType string, permissio
 
 	//获取媒体中还包含上架套餐的id
 	if len(disCardMediaIds) > 0 {
-		reportIdsSalePackage, _ := merchantDao.GetMediaOnSalePackageIds(disCardMediaIds, transProductMap[mediaType])
+		reportIdsSalePackage, _ := merchantDao.GetMediaOnSalePackageIds(disCardMediaIds)
 		reportIdsSaleProduct, _ := merchantDao.GetOnSaleMediaIds(disCardMediaIds, transProductMap[mediaType])
 		showReportMap := make(map[int]bool)
 		disCardMap := make(map[int]bool)

models/merchant/merchant_product.go

@@ -253,28 +253,19 @@ func GetReportOnSalePackageIds(ids []int) (sourceIds []int, err error) {
 	err = db.Raw(sql, ids, ids).Scan(&sourceIds).Error
 	return
 }
-func GetMediaOnSalePackageIds(ids []int, productType MerchantProductType) (sourceIds []int, err error) {
-	sql := `SELECT
-  a.id
-
-  (
-    SELECT
-      m.id
+func GetMediaOnSalePackageIds(ids []int) (sourceIds []int, err error) {
+	sql := `  SELECT
+      distinct mpm.media_id
     FROM
       media_permission_mappings mpm
       LEFT JOIN merchant_products mp ON mp.source_id = mpm.permission_id 
       AND mp.type = 'package' 
-      AND mp.sale_status = 'on_sale' 
-      AND mp.deleted = 0
+      AND mp.sale_status = 'on_sale'
+      and mp.deleted=0
     WHERE
-      mpm.media_id IS NOT NULL  and mp.media_id in ?
-  ) a where a.id in ?
-GROUP BY
-  a.id 
-ORDER BY
-  a.id`
+        mpm.deleted=0  and mp.id is not null and mpm.media_id in ?`
 	db := models.Main()
-	err = db.Raw(sql, ids, ids).Scan(&sourceIds).Error
+	err = db.Raw(sql, ids).Scan(&sourceIds).Error
 	return
 }
 func GetOnSaleReportIds(ids []int) (sourceIds []int, err error) {
@@ -294,19 +285,15 @@ func GetOnSaleReportIds(ids []int) (sourceIds []int, err error) {
 }
 func GetOnSaleMediaIds(ids []int, productType MerchantProductType) (sourceIds []int, err error) {
 	sql := `SELECT
-      r.id
+     distinct mpm.media_id
     FROM
-      reports r
-      LEFT JOIN merchant_products mp ON mp.source_id = r.id
+     media_permission_mappings mpm
+      LEFT JOIN merchant_products mp ON mp.source_id = mpm.media_id
       AND mp.type = ?
       AND mp.sale_status = 'on_sale'
       AND mp.deleted = 0
     WHERE
-      mp.id IS NOT NULL and mp.id in ?
-GROUP BY
-  r.id 
-ORDER BY
-  r.id`
+       mpm.deleted=0  and mp.id is not null and mpm.media_id in ?`
 	db := models.Main()
 	err = db.Raw(sql, productType, ids).Scan(&sourceIds).Error
 	return