master
howell 3 years ago
parent fc3cfd12f7
commit 0cc35e916e

@ -99,7 +99,7 @@ func QueryGoodsListByComprehension(c *gin.Context) {
if p.ActivityID != 0 { if p.ActivityID != 0 {
// 批发活动id // 批发活动id
sub := mysql2.Db.Table((&ac2.ActivityGoods{}).TableName()).Select("goods_id").Where("activity_id = ?", p.ActivityID) sub := mysql2.Db.Table((&ac2.ActivityGoods{}).TableName()).Select("goods_id").Where("activity_id = ?", p.ActivityID)
q3 = q3.Where("id in ?", sub) q3 = q3.Where("id in (?)", sub)
} }
findByKeyWord(q3, p.Keyword, &goodsList, p.Page) findByKeyWord(q3, p.Keyword, &goodsList, p.Page)
back.Suc(c, "", GetGoodsRespByInfoList(goodsList, p.UserId, p.IsSale)) back.Suc(c, "", GetGoodsRespByInfoList(goodsList, p.UserId, p.IsSale))
@ -151,7 +151,7 @@ func QueryGoodsListBySalesVolume(c *gin.Context) {
if p.ActivityID != 0 { if p.ActivityID != 0 {
// 批发活动id // 批发活动id
sub := mysql2.Db.Table((&ac2.ActivityGoods{}).TableName()).Select("goods_id").Where("activity_id = ?", p.ActivityID) sub := mysql2.Db.Table((&ac2.ActivityGoods{}).TableName()).Select("goods_id").Where("activity_id = ?", p.ActivityID)
q3 = q3.Where("id in ?", sub) q3 = q3.Where("id in (?)", sub)
} }
findByKeyWord(q3, p.Keyword, &goodsList, p.Page) findByKeyWord(q3, p.Keyword, &goodsList, p.Page)
back.Suc(c, "", GetGoodsRespByInfoList(goodsList, p.UserId, p.IsSale)) back.Suc(c, "", GetGoodsRespByInfoList(goodsList, p.UserId, p.IsSale))
@ -180,7 +180,7 @@ func QueryGoodsListByDiscountPrice(c *gin.Context) {
if p.ActivityID != 0 { if p.ActivityID != 0 {
// 批发活动id // 批发活动id
sub := mysql2.Db.Table((&ac2.ActivityGoods{}).TableName()).Select("goods_id").Where("activity_id = ?", p.ActivityID) sub := mysql2.Db.Table((&ac2.ActivityGoods{}).TableName()).Select("goods_id").Where("activity_id = ?", p.ActivityID)
q3 = q3.Where("id in ?", sub) q3 = q3.Where("id in (?)", sub)
} }
findByKeyWord(q3, p.Keyword, &goodsInfoIdList, p.Page) findByKeyWord(q3, p.Keyword, &goodsInfoIdList, p.Page)

@ -3,6 +3,7 @@ package app
import ( import (
"recook/internal/api/mobile/bill" "recook/internal/api/mobile/bill"
"recook/internal/api/mobile/live" "recook/internal/api/mobile/live"
"recook/internal/secure"
_ "recook/internal/secure" _ "recook/internal/secure"
"recook/internal/v2/router/middleware" "recook/internal/v2/router/middleware"
@ -52,9 +53,9 @@ func SetupRouter(v1 *gin.RouterGroup) {
} }
v1.Group("activity").POST("/detail", activity.QueryActivityDetail) v1.Group("activity").POST("/detail", activity.QueryActivityDetail)
//测试时注销 //测试时注销
v1.Use(authorize()) //v1.Use(authorize())
//测试完成后注销注销 //测试完成后注销注销
//v1.Use(secure.FakeEcrypt()) v1.Use(secure.FakeEcrypt())
v1.Use(decrypt()) v1.Use(decrypt())
{ {

Loading…
Cancel
Save