fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-09-07 18:39:36 +08:00
commit bf35122c38
9 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
model/gmodel/fs_change_code_gen.go
View File

@ -11,6 +11,7 @@ type FsChangeCode struct {
Code *string `gorm:"default:'';" json:"code"` //
CreatedAt *int64 `gorm:"default:0;" json:"created_at"` // 创建时间
IsUse *int64 `gorm:"default:0;" json:"is_use"` // 是否使用 1已使用 0未使用
Metadata *[]byte `gorm:"default:'';" json:"metadata"` //
}
type FsChangeCodeModel struct {
db *gorm.DB

1
model/gmodel/fs_product_gen.go
View File

@ -35,6 +35,7 @@ type FsProduct struct {
RecommendProduct *string `gorm:"default:'';" json:"recommend_product"` //
RecommendProductSort *string `gorm:"default:'';" json:"recommend_product_sort"` //
SceneIds *string `gorm:"default:'';" json:"scene_ids"` //
IsCustomization *int64 `gorm:"default:0;" json:"is_customization"` // 是否可定制
}
type FsProductModel struct {
db *gorm.DB

1
model/gmodel/fs_quotation_gen.go
View File

@ -14,6 +14,7 @@ type FsQuotation struct {
PageNum *int64 `gorm:"default:0;" json:"page_num"` // 页数
ProductNum *int64 `gorm:"default:0;" json:"product_num"` // 产品数量
GiftNum *int64 `gorm:"default:0;" json:"gift_num"` // 赠品数
SequenceNum *string `gorm:"default:'';" json:"sequence_num"` //
Status *int64 `gorm:"default:0;" json:"status"` // 状态位 0停用 1待设计 2设计中 3待报价 4报价中 5完成
Ctime *int64 `gorm:"default:0;" json:"ctime"` // 添加时间
DesignId *int64 `gorm:"default:0;" json:"design_id"` // 设计人员

3
model/gmodel/fs_resource_gen.go
View File

@ -1,9 +1,8 @@
package gmodel
import (
"time"
"gorm.io/gorm"
"time"
)
// fs_resource 资源表

1
server/product/internal/logic/getrecommandproductlistlogic.go
View File

@ -193,6 +193,7 @@ func (l *GetRecommandProductListLogic) GetRecommandProductList(req *types.GetRec
Intro: *v.Intro,
IsRecommend: isRecommend,
MinPrice: minPrice,
IsCustomization: *productInfo.IsCustomization,
}
if _, ok := mapTagProp[productInfo.Id]; ok {
item.CoverDefault = mapTagProp[productInfo.Id]

1
server/product/internal/logic/gettagproductlistlogic.go
View File

@ -444,6 +444,7 @@ func (l *GetTagProductListLogic) getTagProducts(req getTagProductsReq) (productL
Recommended: *productInfo.IsRecommend > 0,
Cover: *productInfo.Cover,
CoverMetadata: req.MapResourceMetadata[*productInfo.Cover],
IsCustomization: *productInfo.IsCustomization,
}
if _, ok = req.MapTagProp[productInfo.Id]; ok {
item.CoverDefault = req.MapTagProp[productInfo.Id]

1
server/product/internal/logic/homepagerecommendproductlistlogic.go
View File

@ -217,6 +217,7 @@ func (l *HomePageRecommendProductListLogic) HomePageRecommendProductList(req *ty
SizeNum: uint32(sizeNum),
MinPrice: minPrice,
HaveOptionalFitting: haveOptionalFitting,
IsCustomization: *productInfo.IsCustomization,
}
if _, ok = mapTagProp[productInfo.Id]; ok {
item.CoverDefault = mapTagProp[productInfo.Id]

3
server/product/internal/types/types.go
View File

@ -246,6 +246,7 @@ type GetRecommandProductListRsp struct {
Intro string `json:"intro"`
IsRecommend int64 `json:"is_recommend"`
MinPrice int64 `json:"min_price"`
IsCustomization int64 `json:"is_customization"`
}
type GetTagProductListReq struct {
@ -281,6 +282,7 @@ type TagProduct struct {
CoverDefault []CoverDefaultItem `json:"cover_default"`
HaveOptionalFitting bool `json:"have_optional_fitting"`
Recommended bool `json:"recommended"`
IsCustomization int64 `json:"is_customization"`
}
type CoverDefaultItem struct {
@ -409,6 +411,7 @@ type HomePageRecommendProductListRsp struct {
MinPrice int64 `json:"min_price"`
CoverDefault []CoverDefaultItem `json:"cover_default"`
HaveOptionalFitting bool `json:"have_optional_fitting"`
IsCustomization int64 `json:"is_customization"`
}
type Request struct {

3
server_api/product.api
View File

@ -298,6 +298,7 @@ type GetRecommandProductListRsp {
Intro string `json:"intro"`
IsRecommend int64 `json:"is_recommend"`
MinPrice int64 `json:"min_price"`
IsCustomization int64 `json:"is_customization"`
}
//获取分类产品列表
type GetTagProductListReq {
@ -331,6 +332,7 @@ type TagProduct {
CoverDefault []CoverDefaultItem `json:"cover_default"`
HaveOptionalFitting bool `json:"have_optional_fitting"`
Recommended bool `json:"recommended"`
IsCustomization int64 `json:"is_customization"`
}
type CoverDefaultItem {
TemplateTag string `json:"template_tag"`
@ -451,4 +453,5 @@ type HomePageRecommendProductListRsp {
MinPrice int64 `json:"min_price"`
CoverDefault []CoverDefaultItem `json:"cover_default"`
HaveOptionalFitting bool `json:"have_optional_fitting"`
IsCustomization int64 `json:"is_customization"`
}