fix
This commit is contained in:
parent
29f6e2ddbf
commit
8ba0952cc5
|
@ -29,6 +29,7 @@ type (
|
||||||
Update(ctx context.Context, data *FsProduct) error
|
Update(ctx context.Context, data *FsProduct) error
|
||||||
Delete(ctx context.Context, id int64) error
|
Delete(ctx context.Context, id int64) error
|
||||||
GetProductListByConditions(ctx context.Context, productType int, isDel int, isShelf int, sort string) ([]FsProduct, error)
|
GetProductListByConditions(ctx context.Context, productType int, isDel int, isShelf int, sort string) ([]FsProduct, error)
|
||||||
|
GetAllProductList(ctx context.Context, isDel int, isShelf int, sort string) (resp []FsProduct, err error)
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultFsProductModel struct {
|
defaultFsProductModel struct {
|
||||||
|
|
|
@ -24,3 +24,20 @@ func (m *defaultFsProductModel) GetProductListByConditions(ctx context.Context,
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
func (m *defaultFsProductModel) GetAllProductList(ctx context.Context, isDel int, isShelf int, sort string) (resp []FsProduct, err error) {
|
||||||
|
query := fmt.Sprintf("select %s from %s where `is_del` =? and `is_shelf` = ?",
|
||||||
|
fsProductRows, m.table)
|
||||||
|
switch sort {
|
||||||
|
case "sort-asc":
|
||||||
|
query = fmt.Sprintf("%s order by sort ASC", query)
|
||||||
|
case "sort-desc":
|
||||||
|
query = fmt.Sprintf("%s order by sort DESC", query)
|
||||||
|
default:
|
||||||
|
query = fmt.Sprintf("%s order by sort DESC", query)
|
||||||
|
}
|
||||||
|
err = m.conn.QueryRowsCtx(ctx, &resp, query, isDel, isShelf)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
|
@ -37,7 +37,6 @@ func NewGetProductListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
|
||||||
// 获取产品列表
|
// 获取产品列表
|
||||||
func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, loginInfo auth.UserInfo) (resp *types.Response) {
|
func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, loginInfo auth.UserInfo) (resp *types.Response) {
|
||||||
resp = &types.Response{}
|
resp = &types.Response{}
|
||||||
loginInfo.UserId = 83
|
|
||||||
//校验前台登录情况
|
//校验前台登录情况
|
||||||
if loginInfo.UserId == 0 {
|
if loginInfo.UserId == 0 {
|
||||||
resp.Set(constants.CODE_UNAUTH, "please sign in")
|
resp.Set(constants.CODE_UNAUTH, "please sign in")
|
||||||
|
|
|
@ -2,10 +2,16 @@ package logic
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fusenapi/utils/auth"
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"fusenapi/constants"
|
||||||
|
"fusenapi/model"
|
||||||
"fusenapi/product/internal/svc"
|
"fusenapi/product/internal/svc"
|
||||||
"fusenapi/product/internal/types"
|
"fusenapi/product/internal/types"
|
||||||
|
"fusenapi/utils/auth"
|
||||||
|
"fusenapi/utils/image"
|
||||||
|
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||||
|
"math/rand"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
@ -25,7 +31,60 @@ func NewGetSuccessRecommandLogic(ctx context.Context, svcCtx *svc.ServiceContext
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *GetSuccessRecommandLogic) GetSuccessRecommand(req *types.GetSuccessRecommandReq, loginInfo auth.UserInfo) (resp *types.Response) {
|
func (l *GetSuccessRecommandLogic) GetSuccessRecommand(req *types.GetSuccessRecommandReq, loginInfo auth.UserInfo) (resp *types.Response) {
|
||||||
// 必须返回response, 前端需要的是内部约定的Code码, 处理相关的逻辑. 例子(eg): resp.Set(501, "error")
|
|
||||||
resp = &types.Response{}
|
resp = &types.Response{}
|
||||||
|
//校验前台登录情况
|
||||||
|
if loginInfo.UserId == 0 {
|
||||||
|
resp.Set(constants.CODE_UNAUTH, "please sign in")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
//获取用户信息
|
||||||
|
userModel := model.NewFsUserModel(l.svcCtx.MysqlConn)
|
||||||
|
userInfo, err := userModel.FindOne(l.ctx, loginInfo.UserId)
|
||||||
|
if err != nil && errors.Is(err, sqlx.ErrNotFound) {
|
||||||
|
logx.Error(err)
|
||||||
|
resp.Set(constants.CODE_SERVICE_ERR, "failed to get user info")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if userInfo == nil {
|
||||||
|
resp.Set(constants.CODE_UNAUTH, "failed to get user info")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if req.Num == 0 {
|
||||||
|
req.Num = 8
|
||||||
|
}
|
||||||
|
if req.Size > 0 {
|
||||||
|
req.Size = image.GetCurrentSize(req.Size)
|
||||||
|
}
|
||||||
|
//获取所有产品的ids
|
||||||
|
productModel := model.NewFsProductModel(l.svcCtx.MysqlConn)
|
||||||
|
productList, err := productModel.GetAllProductList(l.ctx, 0, 1, "sort-asc")
|
||||||
|
if err != nil {
|
||||||
|
logx.Error(err)
|
||||||
|
resp.Set(constants.CODE_SERVICE_ERR, "failed to get product list")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
//没有推荐产品就返回
|
||||||
|
if len(productList) == 0 {
|
||||||
|
resp.Set(constants.CODE_OK, "success")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
productIds := make([]string, 0, len(productList))
|
||||||
|
for _, v := range productList {
|
||||||
|
productIds = append(productIds, fmt.Sprintf("%d", v.Id))
|
||||||
|
}
|
||||||
|
//随机取8个
|
||||||
|
if len(productIds) > int(req.Num) {
|
||||||
|
//打乱顺序
|
||||||
|
indexArr := rand.Perm(len(productIds))
|
||||||
|
tmpProductIds := make([]string, 0, int(req.Num))
|
||||||
|
for k, v := range indexArr {
|
||||||
|
if k == 8 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
tmpProductIds = append(tmpProductIds, productIds[v])
|
||||||
|
}
|
||||||
|
productIds = tmpProductIds
|
||||||
|
}
|
||||||
|
|
||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user