合并develop

server/websocket/internal/logic/ws_render_image.go

@@ -100,6 +100,15 @@ func (w *wsConnectItem) renderImage(data []byte) {
 		logx.Error("invalid format of websocket render image message", err)
 		return
 	}
+	lenColor := len(renderImageData.RenderData.TemplateTagColor.Color)
+	if lenColor == 0 {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入模板标签选择的颜色", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
+		return
+	}
+	if renderImageData.RenderData.TemplateTagColor.SelectedIndex >= lenColor || renderImageData.RenderData.TemplateTagColor.SelectedIndex < 0 {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "选择的模板标签颜色索引越界", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
+		return
+	}
 	//获取产品信息(部分字段)
 	productInfo, err := w.logic.svcCtx.AllModels.FsProduct.FindOne(w.logic.ctx, renderImageData.RenderData.ProductId, "id,is_customization")
 	if err != nil {
@@ -192,6 +201,10 @@ func (w *wsConnectItem) renderImage(data []byte) {
 		Phone:       renderImageData.RenderData.Phone,
 		Qrcode:      renderImageData.RenderData.Qrcode,
 		LogoUrl:     renderImageData.RenderData.Logo,
+		TemplateTagColor: repositories.TemplateTagColor{
+			Color: renderImageData.RenderData.TemplateTagColor.Color,
+			Index: renderImageData.RenderData.TemplateTagColor.SelectedIndex,
+		},
 	}
 	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
 	if err != nil {
@@ -216,7 +229,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
 	}
 	//获取唯一id
 	taskId := w.genRenderTaskId(combineImage, renderImageData, model3dInfo, productTemplate, element)
-	//查询有没有缓存的资源,有就返回######################
+	//查询有没有缓存的资源,有就返回
 	resource, err := w.logic.svcCtx.AllModels.FsResource.FindOneById(w.logic.ctx, taskId)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {