fix
This commit is contained in:
@@ -2,16 +2,9 @@ package logic
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"fusenapi/model"
|
||||
"fusenapi/utils/auth"
|
||||
"fusenapi/utils/image"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlc"
|
||||
"strings"
|
||||
|
||||
"fusenapi/product/internal/svc"
|
||||
"fusenapi/product/internal/types"
|
||||
"fusenapi/utils/auth"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
@@ -31,10 +24,10 @@ func NewGetProductInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
|
||||
}
|
||||
|
||||
// 获取产品详情
|
||||
func (l *GetProductInfoLogic) GetProductInfo(req *types.GetProductInfoReq, loginInfo auth.UserInfo) (resp *types.Response, err error) {
|
||||
func (l *GetProductInfoLogic) GetProductInfo(req *types.GetProductInfoReq, loginInfo auth.UserInfo) (resp *types.Response) {
|
||||
//校验前台登录情况
|
||||
if loginInfo.UserId == 0 {
|
||||
return &types.Response{Code: 402, Message: "please sign in"}, nil
|
||||
/*if loginInfo.UserId == 0 {
|
||||
return &types.Response{Code: 402, Message: "please sign in"}
|
||||
}
|
||||
req.Pid = strings.Trim(req.Pid, " ")
|
||||
req.ClientNo = strings.Trim(req.ClientNo, " ")
|
||||
@@ -46,28 +39,28 @@ func (l *GetProductInfoLogic) GetProductInfo(req *types.GetProductInfoReq, login
|
||||
productInfo, err := productModel.FindOneBySn(l.ctx, req.Pid)
|
||||
if err != nil && !errors.Is(err, sqlc.ErrNotFound) {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "failed to get product info"}, nil
|
||||
return &types.Response{Code: 510, Message: "failed to get product info"}
|
||||
}
|
||||
if productInfo == nil {
|
||||
return &types.Response{Code: 510, Message: "product not found"}, nil
|
||||
return &types.Response{Code: 510, Message: "product not found"}
|
||||
}
|
||||
//获取产品标签
|
||||
tagModel := model.NewFsTagsModel(l.svcCtx.MysqlConn)
|
||||
tagInfo, err := tagModel.FindOne(l.ctx, productInfo.Type)
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "failed to get product tag"}, nil
|
||||
return &types.Response{Code: 510, Message: "failed to get product tag"}
|
||||
}
|
||||
//获取产品尺寸列表
|
||||
productSizeModel := model.NewFsProductSizeModel(l.svcCtx.MysqlConn)
|
||||
productSizeList, err := productSizeModel.FindAllByStatus(l.ctx, 1, 1)
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "failed to get product size list"}, nil
|
||||
return &types.Response{Code: 510, Message: "failed to get product size list"}
|
||||
}
|
||||
sizeIds := make([]string, 0, len(productSizeList))
|
||||
for _, v := range productSizeList {
|
||||
sizeIds = append(sizeIds, fmt.Sprintf("%d", v.Id))
|
||||
}
|
||||
}*/
|
||||
return
|
||||
}
|
||||
|
||||
@@ -35,19 +35,19 @@ func NewGetProductListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
|
||||
}
|
||||
|
||||
// 获取产品列表
|
||||
func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, loginInfo auth.UserInfo) (resp *types.Response, err error) {
|
||||
func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, loginInfo auth.UserInfo) (resp *types.Response) {
|
||||
//校验前台登录情况
|
||||
if loginInfo.UserId == 0 {
|
||||
return &types.Response{Code: 402, Message: "please sign in"}, nil
|
||||
return &types.Response{Code: 402, Message: "please sign in"}
|
||||
}
|
||||
//如果是demo
|
||||
if req.IsDemo == 1 {
|
||||
var demo types.GetProductListRsp
|
||||
if err = json.Unmarshal([]byte(l.DemoProductList()), &demo); err != nil {
|
||||
if err := json.Unmarshal([]byte(l.DemoProductList()), &demo); err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "demo data format err"}, nil
|
||||
return &types.Response{Code: 510, Message: "demo data format err"}
|
||||
}
|
||||
return &types.Response{Code: 200, Message: "success", Data: demo}, nil
|
||||
return &types.Response{Code: 200, Message: "success", Data: demo}
|
||||
}
|
||||
if req.Page <= 0 {
|
||||
req.Page = 1
|
||||
@@ -61,22 +61,22 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, login
|
||||
userInfo, err := userModel.FindOne(l.ctx, loginInfo.UserId)
|
||||
if err != nil && !errors.Is(err, sqlc.ErrNotFound) {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "get user info err"}, nil
|
||||
return &types.Response{Code: 510, Message: "get user info err"}
|
||||
}
|
||||
if userInfo == nil {
|
||||
return &types.Response{Code: 402, Message: "user not exists"}, nil
|
||||
return &types.Response{Code: 402, Message: "user not exists"}
|
||||
}
|
||||
//查询符合的产品列表
|
||||
productModel := model.NewFsProductModel(l.svcCtx.MysqlConn)
|
||||
productList, err := productModel.GetProductListByConditions(l.ctx, int(req.Cid), 0, 1, "sort-desc")
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "failed to get product list"}, nil
|
||||
return &types.Response{Code: 510, Message: "failed to get product list"}
|
||||
}
|
||||
fmt.Println(len(productList))
|
||||
productLen := len(productList)
|
||||
if productLen == 0 {
|
||||
return &types.Response{Code: 200, Message: "success"}, nil
|
||||
return &types.Response{Code: 200, Message: "success"}
|
||||
}
|
||||
//提取产品ids
|
||||
productIds := make([]string, 0, productLen)
|
||||
@@ -87,7 +87,7 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, login
|
||||
productPriceList, err := productPriceModel.GetPriceList(l.ctx, productIds)
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "failed to get product min price list"}, nil
|
||||
return &types.Response{Code: 510, Message: "failed to get product min price list"}
|
||||
}
|
||||
//存储产品最小价格
|
||||
mapProductMinPrice := make(map[int64]int64)
|
||||
@@ -96,7 +96,7 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, login
|
||||
priceSlice, err := format.StrSlicToIntSlice(priceStrSlic)
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: err.Error()}, nil
|
||||
return &types.Response{Code: 510, Message: err.Error()}
|
||||
}
|
||||
if len(priceSlice) == 0 {
|
||||
continue
|
||||
@@ -109,7 +109,7 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, login
|
||||
productTemplatesV2, err := productTemplateModel.FindAllByCondition(l.ctx, productIds, 0, 1)
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "get product template_v2 err"}, nil
|
||||
return &types.Response{Code: 510, Message: "get product template_v2 err"}
|
||||
}
|
||||
mapProductTemplate := make(map[int64]struct{})
|
||||
for _, v := range productTemplatesV2 {
|
||||
@@ -120,17 +120,17 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, login
|
||||
tagInfo, err := tagsModel.FindOne(l.ctx, req.Cid)
|
||||
if err != nil && !errors.Is(err, sqlc.ErrNotFound) {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "get classification err "}, nil
|
||||
return &types.Response{Code: 510, Message: "get classification err "}
|
||||
}
|
||||
if tagInfo == nil {
|
||||
return &types.Response{Code: 510, Message: "classification not exists "}, nil
|
||||
return &types.Response{Code: 510, Message: "classification not exists "}
|
||||
}
|
||||
//获取产品尺寸数量
|
||||
productSizeModel := model.NewFsProductSizeModel(l.svcCtx.MysqlConn)
|
||||
productSizeCount, err := productSizeModel.CountByStatus(l.ctx, 1)
|
||||
if err != nil {
|
||||
logx.Error(err)
|
||||
return &types.Response{Code: 510, Message: "get product size count err "}, nil
|
||||
return &types.Response{Code: 510, Message: "get product size count err "}
|
||||
}
|
||||
//拼接返回
|
||||
itemList := make([]types.Items, 0, productLen)
|
||||
@@ -185,7 +185,7 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, login
|
||||
},
|
||||
TypeName: tagInfo.Title,
|
||||
Description: tagInfo.Description,
|
||||
}}, nil
|
||||
}}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user