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

11

Browse Source
This commit is contained in:
laodaming 2023-09-19 15:09:48 +08:00
parent f7c3ccd01d
commit 55e1e5cb47
2 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/websocket/internal/logic/ws_render_image.go
View File

@ -100,6 +100,10 @@ func (w *wsConnectItem) renderImage(data []byte) {
logx.Error("invalid format of websocket render image message", err) logx.Error("invalid format of websocket render image message", err)
return return
} }
if renderImageData.RenderData.Logo == "" {
w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入logo", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
return
}
lenColor := len(renderImageData.RenderData.TemplateTagColor.Color) lenColor := len(renderImageData.RenderData.TemplateTagColor.Color)
if lenColor == 0 { if lenColor == 0 {
w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入模板标签选择的颜色", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0) w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入模板标签选择的颜色", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
@ -126,7 +130,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
return return
} }
//获取用户需要渲染logo //获取用户需要渲染logo
logoInfo, err := w.logic.svcCtx.Repositories.ImageHandle.LogoInfo(w.logic.ctx, &repositories.LogoInfoReq{ /*logoInfo, err := w.logic.svcCtx.Repositories.ImageHandle.LogoInfo(w.logic.ctx, &repositories.LogoInfoReq{
UserId: w.userId, UserId: w.userId,
GuestId: w.guestId, GuestId: w.guestId,
}) })
@ -139,7 +143,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "用户logo素材url是空的", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0) w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "用户logo素材url是空的", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
return return
} }
renderImageData.RenderData.Logo = *logoInfo.LogoUrl renderImageData.RenderData.Logo = *logoInfo.LogoUrl*/
//用户id赋值 //用户id赋值
renderImageData.RenderData.UserId = w.userId renderImageData.RenderData.UserId = w.userId
renderImageData.RenderData.GuestId = w.guestId renderImageData.RenderData.GuestId = w.guestId
@ -171,7 +175,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
return return
} }
//获取模板开关信息并且对于没有默认值的给赋值默认值(但凡DIY有一个是空的就要请求默认数据) //获取模板开关信息并且对于没有默认值的给赋值默认值(但凡DIY有一个是空的就要请求默认数据)
if renderImageData.RenderData.Website == "" || renderImageData.RenderData.Phone == "" || renderImageData.RenderData.Address == "" || renderImageData.RenderData.Qrcode == "" || renderImageData.RenderData.Slogan == "" { /*if renderImageData.RenderData.Website == "" || renderImageData.RenderData.Phone == "" || renderImageData.RenderData.Address == "" || renderImageData.RenderData.Qrcode == "" || renderImageData.RenderData.Slogan == "" {
templateSwitchInfo := template_switch_info.GetTemplateSwitchInfo(productTemplate.Id, productTemplate.TemplateInfo, *productTemplate.MaterialImg) templateSwitchInfo := template_switch_info.GetTemplateSwitchInfo(productTemplate.Id, productTemplate.TemplateInfo, *productTemplate.MaterialImg)
if renderImageData.RenderData.Website == "" && templateSwitchInfo.MaterialData.Website.IfShow { if renderImageData.RenderData.Website == "" && templateSwitchInfo.MaterialData.Website.IfShow {
renderImageData.RenderData.Website = templateSwitchInfo.MaterialData.Website.DefaultValue renderImageData.RenderData.Website = templateSwitchInfo.MaterialData.Website.DefaultValue
@ -188,19 +192,19 @@ func (w *wsConnectItem) renderImage(data []byte) {
if renderImageData.RenderData.Slogan == "" && templateSwitchInfo.MaterialData.Slogan.IfShow { if renderImageData.RenderData.Slogan == "" && templateSwitchInfo.MaterialData.Slogan.IfShow {
renderImageData.RenderData.Slogan = templateSwitchInfo.MaterialData.Slogan.DefaultValue renderImageData.RenderData.Slogan = templateSwitchInfo.MaterialData.Slogan.DefaultValue
} }
} }*/
//获取刀版图 //获取刀版图
combineReq := repositories.LogoCombineReq{ combineReq := repositories.LogoCombineReq{
UserId: renderImageData.RenderData.UserId, UserId: renderImageData.RenderData.UserId,
GuestId: renderImageData.RenderData.GuestId, GuestId: renderImageData.RenderData.GuestId,
TemplateId: productTemplate.Id, ProductTemplateV2Info: productTemplate,
TemplateTag: renderImageData.RenderData.TemplateTag, TemplateTag: renderImageData.RenderData.TemplateTag,
Website: renderImageData.RenderData.Website, Website: renderImageData.RenderData.Website,
Slogan: renderImageData.RenderData.Slogan, Slogan: renderImageData.RenderData.Slogan,
Address: renderImageData.RenderData.Address, Address: renderImageData.RenderData.Address,
Phone: renderImageData.RenderData.Phone, Phone: renderImageData.RenderData.Phone,
Qrcode: renderImageData.RenderData.Qrcode, Qrcode: renderImageData.RenderData.Qrcode,
LogoUrl: renderImageData.RenderData.Logo, LogoUrl: renderImageData.RenderData.Logo,
TemplateTagColor: repositories.TemplateTagColor{ TemplateTagColor: repositories.TemplateTagColor{
Color: renderImageData.RenderData.TemplateTagColor.Color, Color: renderImageData.RenderData.TemplateTagColor.Color,
Index: renderImageData.RenderData.TemplateTagColor.SelectedIndex, Index: renderImageData.RenderData.TemplateTagColor.SelectedIndex,

39
service/repositories/image_handle.go
View File

@ -195,17 +195,17 @@ func (l *defaultImageHandle) LogoInfoSet(ctx context.Context, in *LogoInfoSetReq
/* logo合图 */ /* logo合图 */
type ( type (
LogoCombineReq struct { LogoCombineReq struct {
UserId int64 `json:"user_id"` UserId int64 `json:"user_id"`
GuestId int64 `json:"guest_id"` GuestId int64 `json:"guest_id"`
TemplateId int64 `json:"template_id"` ProductTemplateV2Info *gmodel.FsProductTemplateV2 `json:"product_template_v_2_info"`
TemplateTag string `json:"template_tag"` TemplateTag string `json:"template_tag"`
Website string `json:"website"` // 合图参数 Website string `json:"website"` // 合图参数
Slogan string `json:"slogan"` // 合图参数 Slogan string `json:"slogan"` // 合图参数
Address string `json:"address"` // 合图参数 Address string `json:"address"` // 合图参数
Phone string `json:"phone"` // 合图参数 Phone string `json:"phone"` // 合图参数
Qrcode string `json:"qrcode"` // 合图参数 Qrcode string `json:"qrcode"` // 合图参数
LogoUrl string `json:"logo_url"` // 合图参数 LogoUrl string `json:"logo_url"` // 合图参数
TemplateTagColor TemplateTagColor `json:"template_tag_color"` TemplateTagColor TemplateTagColor `json:"template_tag_color"` //合图颜色
} }
LogoCombineRes struct { LogoCombineRes struct {
ResourceId string ResourceId string
@ -257,15 +257,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
} }
} }
// 没有查到，先根据模版id 查询模版数据 请求算法数据
productTemplateV2Model := gmodel.NewFsProductTemplateV2Model(l.MysqlConn)
productTemplateV2Info, err := productTemplateV2Model.FindOne(ctx, in.TemplateId)
if err != nil {
logc.Errorf(ctx, "productTemplateV2Model.FindOne：%v", err)
return nil, err
}
productTemplateTagInfo, err := gmodel.NewFsProductTemplateTagsModel(l.MysqlConn).FindOneByTagName(ctx, in.TemplateTag, "groups") productTemplateTagInfo, err := gmodel.NewFsProductTemplateTagsModel(l.MysqlConn).FindOneByTagName(ctx, in.TemplateTag, "groups")
if err != nil { if err != nil {
@ -275,9 +266,9 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
var groupOptions map[string]interface{} var groupOptions map[string]interface{}
var materialList []interface{} var materialList []interface{}
if productTemplateV2Info.TemplateInfo != nil { if in.ProductTemplateV2Info.TemplateInfo != nil {
var templateInfo map[string]interface{} var templateInfo map[string]interface{}
err = json.Unmarshal([]byte(*productTemplateV2Info.TemplateInfo), &templateInfo) err = json.Unmarshal([]byte(*in.ProductTemplateV2Info.TemplateInfo), &templateInfo)
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
@ -301,8 +292,8 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
} }
var moduleDataMap = make(map[string]interface{}, 4) var moduleDataMap = make(map[string]interface{}, 4)
moduleDataMap["id"] = productTemplateV2Info.Id moduleDataMap["id"] = in.ProductTemplateV2Info.Id
moduleDataMap["material"] = productTemplateV2Info.MaterialImg moduleDataMap["material"] = in.ProductTemplateV2Info.MaterialImg
moduleDataMap["groupOptions"] = groupOptions moduleDataMap["groupOptions"] = groupOptions
moduleDataMap["materialList"] = materialList moduleDataMap["materialList"] = materialList