From 8e14ed2f926ce97da6c0968c18b9f642a30a6d70 Mon Sep 17 00:00:00 2001
From: howell <2827207845@qq.com>
Date: Fri, 18 Mar 2022 11:38:13 +0800
Subject: [PATCH] fix: is_sale

---
 internal/api/mobile/goods/hot_sell_list.go | 47 ++++------------------
 internal/api/mobile/newertehui/query.go    |  8 ++--
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/internal/api/mobile/goods/hot_sell_list.go b/internal/api/mobile/goods/hot_sell_list.go
index d709d38..37b76ba 100755
--- a/internal/api/mobile/goods/hot_sell_list.go
+++ b/internal/api/mobile/goods/hot_sell_list.go
@@ -13,6 +13,7 @@ import (
 
 type UserParam struct {
 	UserID uint `json:"user_id"`
+	IsSale bool `json:"is_sale"`
 }
 
 func QueryHotSellGoodsList(c *gin.Context) {
@@ -21,41 +22,9 @@ func QueryHotSellGoodsList(c *gin.Context) {
 		back.Fail(c, err.Error())
 		return
 	}
-	//var rankings []goods.HotSellRankings
-	//dbc.DB.Select("goods_id").Limit(10).Offset(0).
-	//	Order("sales desc, clicks desc").Find(&rankings, "date = ?", time.Now().Format("2006-01-02"))
-	//
-	//var goodsIdList []uint
-	//for _, v := range rankings {
-	//	goodsIdList = append(goodsIdList, v.GoodsId)
-	//}
-	//
-	//list := make([]QueryCategoryGoodsListResp, 0, 0)
-	//if len(goodsIdList) > 0 {
-	//	var goodsList []goods.Information
-	//	for _, v := range goodsIdList {
-	//		var goodsInfo goods.Information
-	//		dbc.DB.First(&goodsInfo, v)
-	//		goodsList = append(goodsList, goodsInfo)
-	//	}
-	//	list = GetGoodsRespByInfoList(goodsList, p.UserID, false)
-	//}
-	// 热销榜单
-	//var goodsList []goods.Information
-	//mysql.Db.Table((&recommendedlist.RecookCommendList{}).TableName()).
-	//	Where("status=?", 10).Pluck("goods_id", &goodsIdList)
-	//list := make([]QueryCategoryGoodsListResp, 0, 0)
-	//if len(goodsIdList) > 0 {
-	//
-	//	for _, v := range goodsIdList {
-	//		var goodsInfo goods.Information
-	//		dbc.DB.First(&goodsInfo, v)
-	//		goodsList = append(goodsList, goodsInfo)
-	//	}
-	//	list = GetGoodsRespByInfoList(goodsList, p.UserID, false)
-	//}
 	var goodsList []goods.Information
-	sub := mysql.Db.Table((&recommendedlist.RecookCommendList{}).TableName()).Select("goods_id").Where("status = 10")
+	sub := mysql.Db.Table((&recommendedlist.RecookCommendList{}).TableName()).
+		Where("is_sale=?", p.IsSale).Select("goods_id").Where("status = 10")
 	mysql.Db.Find(&goodsList, "id in (?)", sub)
 	list := GetGoodsRespByInfoList(goodsList, p.UserID, false)
 	back.Suc(c, "", list)
@@ -105,7 +74,7 @@ func QueryRecookMake(c *gin.Context) {
 	}
 	goodsIdList := []uint{23, 35, 66, 68, 173, 188, 227, 231, 314, 317}
 
-	list := make([]QueryCategoryGoodsListResp, 0, 0)
+	list := make([]QueryCategoryGoodsListResp, 0)
 	if len(goodsIdList) > 0 {
 		var goodsList []goods.Information
 		for _, v := range goodsIdList {
@@ -113,7 +82,7 @@ func QueryRecookMake(c *gin.Context) {
 			dbc.DB.First(&goodsInfo, v)
 			goodsList = append(goodsList, goodsInfo)
 		}
-		list = GetGoodsRespByInfoList(goodsList, p.UserID, false)
+		list = GetGoodsRespByInfoList(goodsList, p.UserID, p.IsSale)
 	}
 
 	back.Suc(c, "", list)
@@ -127,7 +96,7 @@ func QueryDigital(c *gin.Context) {
 	}
 	goodsIdList := []uint{9, 12, 35, 44, 49, 311, 23, 39, 42, 27}
 
-	list := make([]QueryCategoryGoodsListResp, 0, 0)
+	list := make([]QueryCategoryGoodsListResp, 0)
 	if len(goodsIdList) > 0 {
 		var goodsList []goods.Information
 		for _, v := range goodsIdList {
@@ -135,7 +104,7 @@ func QueryDigital(c *gin.Context) {
 			dbc.DB.First(&goodsInfo, v)
 			goodsList = append(goodsList, goodsInfo)
 		}
-		list = GetGoodsRespByInfoList(goodsList, p.UserID, false)
+		list = GetGoodsRespByInfoList(goodsList, p.UserID, p.IsSale)
 	}
 
 	back.Suc(c, "", list)
@@ -158,7 +127,7 @@ func QueryHomeLive(c *gin.Context) {
 			dbc.DB.First(&goodsInfo, v)
 			goodsList = append(goodsList, goodsInfo)
 		}
-		list = GetGoodsRespByInfoList(goodsList, p.UserID, false)
+		list = GetGoodsRespByInfoList(goodsList, p.UserID, p.IsSale)
 	}
 
 	back.Suc(c, "", list)
diff --git a/internal/api/mobile/newertehui/query.go b/internal/api/mobile/newertehui/query.go
index 8cc8b94..b5dc9a7 100755
--- a/internal/api/mobile/newertehui/query.go
+++ b/internal/api/mobile/newertehui/query.go
@@ -1,8 +1,6 @@
 package newertehui
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/shopspring/decimal"
 	"recook/internal/back"
 	"recook/internal/dbc"
 	"recook/internal/model/coupon"
@@ -11,6 +9,9 @@ import (
 	"recook/internal/model/promotion"
 	"recook/tools"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/shopspring/decimal"
 )
 
 type tehuiResp struct {
@@ -38,6 +39,7 @@ type allPrice struct {
 
 type currentParams struct {
 	UserID uint `json:"userId"`
+	IsSale bool `json:"is_sale"`
 }
 
 func QueryCurrent(c *gin.Context) {
@@ -64,7 +66,7 @@ func QueryCurrent(c *gin.Context) {
 	var tehuiGoodsList []newertehui.Goods
 	dbc.DB.Find(&tehuiGoodsList, "tehui_id = ?", info.ID)
 
-	list := make([]goodsDetail, 0, 0)
+	list := make([]goodsDetail, 0)
 	for _, v := range tehuiGoodsList {
 		var goodsInfo goods.Information
 		dbc.DB.First(&goodsInfo, v.GoodsId)