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:
Hiven 2023-08-18 17:16:54 +08:00
commit 60e4713806
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/websocket/internal/logic/ws_render_image_logic.go
View File

@ -164,7 +164,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
return err return err
} }
//获取刀版图 //获取刀版图
res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &repositories.LogoCombineReq{ combineReq := repositories.LogoCombineReq{
UserId: info.RenderData.UserId, UserId: info.RenderData.UserId,
GuestId: info.RenderData.GuestId, GuestId: info.RenderData.GuestId,
TemplateId: productTemplate.Id, TemplateId: productTemplate.Id,
@ -173,7 +173,8 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
Slogan: info.RenderData.Slogan, Slogan: info.RenderData.Slogan,
Address: info.RenderData.Address, Address: info.RenderData.Address,
Phone: info.RenderData.Phone, Phone: info.RenderData.Phone,
}) }
res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
if err != nil { if err != nil {
logx.Error("合成刀版图失败:", err) logx.Error("合成刀版图失败:", err)
return err return err
@ -185,7 +186,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
logx.Error("合成刀版图失败,合成的刀版图是空指针:", err) logx.Error("合成刀版图失败,合成的刀版图是空指针:", err)
return err return err
} }
logx.Info("合成刀版图成功,原logo:", info.RenderData.Logo, "刀版图：", *res.ResourceUrl) logx.Info("合成刀版图成功,合成刀版图数据:", combineReq, ",模板id：", productTemplate.Id, ",原logo:", info.RenderData.Logo, "刀版图：", *res.ResourceUrl)
//获取渲染设置信息 //获取渲染设置信息
element, err := w.logic.svcCtx.AllModels.FsProductTemplateElement.FindOneByModelId(w.logic.ctx, *productTemplate.ModelId) element, err := w.logic.svcCtx.AllModels.FsProductTemplateElement.FindOneByModelId(w.logic.ctx, *productTemplate.ModelId)
if err != nil { if err != nil {