diff --git a/model/gmodel/fs_product_model3d_gen.go b/model/gmodel/fs_product_model3d_gen.go index e33f097d..cab95732 100644 --- a/model/gmodel/fs_product_model3d_gen.go +++ b/model/gmodel/fs_product_model3d_gen.go @@ -29,7 +29,7 @@ type FsProductModel3d struct { IsCloudRender *int64 `gorm:"default:0;" json:"is_cloud_render"` // 是否设置为云渲染模型 Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // StepPrice *[]byte `gorm:"default:'';" json:"step_price"` // - PackedUnit *int64 `gorm:"default:0;" json:"packed_unit"` // 被打包的数量单位 + PackedUnit *int64 `gorm:"default:1;" json:"packed_unit"` // 被打包的数量单位 } type FsProductModel3dModel struct { db *gorm.DB diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 195bc86d..24aae79e 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -223,14 +223,18 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe } //qrcode不需要依赖合图组开关 if switchInfo.SwitchInfo.QRcode.IfShow && switchInfo.SwitchInfo.QRcode.UserDisabled { - combineReq.Qrcode = &switchInfo.SwitchInfo.QRcode.DefaultValue + if renderImageData.RenderData.Qrcode == "" { + combineReq.Qrcode = &switchInfo.SwitchInfo.QRcode.Text + } else { + combineReq.Qrcode = &renderImageData.RenderData.Qrcode + } } //合图组开关开启 if switchInfo.CombineIsVisible { //开启slogan if switchInfo.SwitchInfo.Slogan.IfShow && switchInfo.SwitchInfo.Slogan.UserDisabled { if renderImageData.RenderData.Slogan == "" { - combineReq.Slogan = &switchInfo.SwitchInfo.Slogan.DefaultValue + combineReq.Slogan = &switchInfo.SwitchInfo.Slogan.Text } else { combineReq.Slogan = &renderImageData.RenderData.Slogan } @@ -238,7 +242,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe //开启website if switchInfo.SwitchInfo.Website.IfShow && switchInfo.SwitchInfo.Website.UserDisabled { if renderImageData.RenderData.Website == "" { - combineReq.Website = &switchInfo.SwitchInfo.Website.DefaultValue + combineReq.Website = &switchInfo.SwitchInfo.Website.Text } else { combineReq.Website = &renderImageData.RenderData.Website } @@ -246,7 +250,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe //开启address if switchInfo.SwitchInfo.Address.IfShow && switchInfo.SwitchInfo.Address.UserDisabled { if renderImageData.RenderData.Address == "" { - combineReq.Address = &switchInfo.SwitchInfo.Address.DefaultValue + combineReq.Address = &switchInfo.SwitchInfo.Address.Text } else { combineReq.Address = &renderImageData.RenderData.Address } @@ -254,7 +258,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe //开启Phone if switchInfo.SwitchInfo.Phone.IfShow && switchInfo.SwitchInfo.Phone.UserDisabled { if renderImageData.RenderData.Phone == "" { - combineReq.Phone = &switchInfo.SwitchInfo.Phone.DefaultValue + combineReq.Phone = &switchInfo.SwitchInfo.Phone.Text } else { combineReq.Phone = &renderImageData.RenderData.Phone } diff --git a/utils/template_switch_info/template_switch.go b/utils/template_switch_info/template_switch.go index bec1b8cb..785d5ca0 100644 --- a/utils/template_switch_info/template_switch.go +++ b/utils/template_switch_info/template_switch.go @@ -23,31 +23,26 @@ type QRcode struct { IfShow bool `json:"if_show"` UserDisabled bool `json:"user_disabled"` Text string `json:"text"` - DefaultValue string `json:"default_value"` } type Website struct { IfShow bool `json:"if_show"` UserDisabled bool `json:"user_disabled"` Text string `json:"text"` - DefaultValue string `json:"default_value"` } type Address struct { IfShow bool `json:"if_show"` UserDisabled bool `json:"user_disabled"` Text string `json:"text"` - DefaultValue string `json:"default_value"` } type Slogan struct { IfShow bool `json:"if_show"` UserDisabled bool `json:"user_disabled"` Text string `json:"text"` - DefaultValue string `json:"default_value"` } type Phone struct { IfShow bool `json:"if_show"` UserDisabled bool `json:"user_disabled"` Text string `json:"text"` - DefaultValue string `json:"default_value"` } type Logo struct { Material string `json:"material"` @@ -64,7 +59,7 @@ type MaterialItem struct { Text string `json:"text"` } -// 获取模板开关信息(目前写死,以后后台做好了功能再更新变动) +// 获取模板开关信息 func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMaterialImg string) GetTemplateSwitchInfoRsp { returnData := GetTemplateSwitchInfoRsp{ Id: templateId, @@ -72,23 +67,18 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa SwitchInfo: SwitchInfo{ QRcode: QRcode{ UserDisabled: true, - DefaultValue: "your qrcode", }, Website: Website{ UserDisabled: true, - DefaultValue: "your website", }, Address: Address{ UserDisabled: true, - DefaultValue: "your address", }, Phone: Phone{ UserDisabled: true, - DefaultValue: "your phone", }, Slogan: Slogan{ UserDisabled: true, - DefaultValue: "your slogan", }, Logo: Logo{ Material: "/image/logo/aHnT1_rzubdwax_scale.png",