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

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

Browse Source
This commit is contained in:
momo 2023-11-24 16:06:17 +08:00
commit d21e004be7
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,6 @@ func (l *GetProductDetailLogic) GetProductDetail(req *types.GetProductDetailReq,
//赋值 //赋值
modelInfoRsp.LightInfo = types.LightInfo{ modelInfoRsp.LightInfo = types.LightInfo{
Id: lightInfo.Id, Id: lightInfo.Id,
LightName: *lightInfo.Name,
LightDesignInfo: lightDesignInfo, LightDesignInfo: lightDesignInfo,
} }
} }

5
server/product/internal/logic/getproductmodelslogic.go
View File

@ -153,7 +153,10 @@ func (l *GetProductModelsLogic) GetProductModels(req *types.GetProductModelsReq,
Name: *v.Name, Name: *v.Name,
MaterialImage: fittingMaterialImage, MaterialImage: fittingMaterialImage,
DesignInfo: modelDesignInfo, DesignInfo: modelDesignInfo,
LightInfo: lightDesignInfo, LightInfo: types.LightInfo{
Id: *v.Light,
LightDesignInfo: lightDesignInfo,
},
}) })
} }
mapProductInfo := make(map[int64][]types.ModelItem) mapProductInfo := make(map[int64][]types.ModelItem)

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

@ -150,7 +150,6 @@ type ModelInfo struct {
type LightInfo struct { type LightInfo struct {
Id int64 `json:"id"` //灯光id Id int64 `json:"id"` //灯光id
LightName string `json:"light_name"` //灯光组名称
LightDesignInfo interface{} `json:"light_design_info"` //灯光设计信息 LightDesignInfo interface{} `json:"light_design_info"` //灯光设计信息
} }
@ -187,7 +186,7 @@ type ModelItem struct {
Name string `json:"name"` Name string `json:"name"`
MaterialImage string `json:"material_image"` //默认贴图 MaterialImage string `json:"material_image"` //默认贴图
DesignInfo interface{} `json:"design_info"` DesignInfo interface{} `json:"design_info"`
LightInfo interface{} `json:"light_info"` LightInfo LightInfo `json:"light_info"`
} }
type Request struct { type Request struct {

3
server_api/product.api
View File

@ -170,7 +170,6 @@ type ModelInfo {
} }
type LightInfo { type LightInfo {
Id int64 `json:"id"` //灯光id Id int64 `json:"id"` //灯光id
LightName string `json:"light_name"` //灯光组名称
LightDesignInfo interface{} `json:"light_design_info"` //灯光设计信息 LightDesignInfo interface{} `json:"light_design_info"` //灯光设计信息
} }
type ProductInfo { type ProductInfo {
@ -203,5 +202,5 @@ type ModelItem {
Name string `json:"name"` Name string `json:"name"`
MaterialImage string `json:"material_image"` //默认贴图 MaterialImage string `json:"material_image"` //默认贴图
DesignInfo interface{} `json:"design_info"` DesignInfo interface{} `json:"design_info"`
LightInfo interface{} `json:"light_info"` LightInfo LightInfo `json:"light_info"`
} }