From 87dd1832797765c6c55a82e573cafffbf17ea7ab Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 14:24:57 +0800 Subject: [PATCH 1/8] fix --- .../logic/calculateproductpricelogic.go | 30 +++++- .../logic/getproductsteppricelogic.go | 96 +++++++------------ server/product/internal/types/types.go | 6 +- server_api/product.api | 6 +- 4 files changed, 65 insertions(+), 73 deletions(-) diff --git a/server/product/internal/logic/calculateproductpricelogic.go b/server/product/internal/logic/calculateproductpricelogic.go index 22bb653a..683e98f6 100644 --- a/server/product/internal/logic/calculateproductpricelogic.go +++ b/server/product/internal/logic/calculateproductpricelogic.go @@ -3,6 +3,7 @@ package logic import ( "encoding/json" "errors" + "fmt" "fusenapi/constants" "fusenapi/model/gmodel" "fusenapi/utils/auth" @@ -83,15 +84,38 @@ func (l *CalculateProductPriceLogic) CalculateProductPrice(req *types.CalculateP } fittingPrice = *fittingInfo.Price } + rangeLen := len(stepPrice.PriceRange) + stepRange := make([]interface{}, 0, rangeLen) + for rIndex, rangeInfo := range stepPrice.PriceRange { + //最后一个 + if rIndex+1 == rangeLen { + begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity)) + stepRange = append(stepRange, map[string]interface{}{ + "start": rangeInfo.StartQuantity, + "end": rangeInfo.EndQuantity, + "range_description": fmt.Sprintf(">=%s Units", begin), + "item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3), + }) + break + } + begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity)) + end := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.EndQuantity)) + stepRange = append(stepRange, map[string]interface{}{ + "start": rangeInfo.StartQuantity, + "end": rangeInfo.EndQuantity, + "range_description": fmt.Sprintf("%s-%s Units", begin, end), + "item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3), + }) + } totalPrice, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(req.PurchaseQuantity, stepPrice, fittingPrice) if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to calculate product price ") } return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateProductPriceRsp{ - ItemPrice: format.CentitoDollar(itemPrice, 3), - TotalPrice: format.CentitoDollarWithNoHalfAdjust(totalPrice, 2), - PurchaseQuantity: req.PurchaseQuantity, + ItemPrice: format.CentitoDollar(itemPrice, 3), + TotalPrice: format.CentitoDollarWithNoHalfAdjust(totalPrice, 2), + StepRange: stepPrice, }) } diff --git a/server/product/internal/logic/getproductsteppricelogic.go b/server/product/internal/logic/getproductsteppricelogic.go index 8db90850..71a4f8fa 100644 --- a/server/product/internal/logic/getproductsteppricelogic.go +++ b/server/product/internal/logic/getproductsteppricelogic.go @@ -11,6 +11,7 @@ import ( "fusenapi/utils/basic" "fusenapi/utils/format" "gorm.io/gorm" + "strings" "fusenapi/server/product/internal/svc" "fusenapi/server/product/internal/types" @@ -50,15 +51,21 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get product info") } //查询产品价格 - modelPriceList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByProductIdTag(l.ctx, req.ProductId, constants.TAG_MODEL, "id,size_id,part_id,step_price,packed_unit") + modelPriceList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByProductIdTag(l.ctx, req.ProductId, constants.TAG_MODEL, "id,size_id,part_list,part_id,step_price,packed_unit") if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get model price list") } fittingIds := make([]int64, 0, len(modelPriceList)) for _, v := range modelPriceList { - if *v.PartId > 0 { - fittingIds = append(fittingIds, *v.PartId) + *v.PartList = strings.Trim(*v.PartList, ",") + if *v.PartList != "" { + tmpPartIds, err := format.StrSlicToInt64Slice(strings.Split(*v.PartList, ",")) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse model part list ") + } + fittingIds = append(fittingIds, tmpPartIds...) } } //查询配件价格列表 @@ -73,77 +80,38 @@ func (l *GetProductStepPriceLogic) GetProductStepPrice(req *types.GetProductStep } //遍历处理模型价格 mapRsp := make(map[string]interface{}) - for _, modelPriceInfo := range modelPriceList { + for _, modelInfo := range modelPriceList { var stepPrice gmodel.StepPriceJsonStruct - if err = json.Unmarshal(*modelPriceInfo.StepPrice, &stepPrice); err != nil { + if err = json.Unmarshal(*modelInfo.StepPrice, &stepPrice); err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeJsonErr, "failed to parse step price json") } rangeLen := len(stepPrice.PriceRange) if rangeLen == 0 { - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price is not set:%d", modelPriceInfo.Id)) + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price is not set:%d", modelInfo.Id)) } - //最小单价 - minPrice := stepPrice.PriceRange[rangeLen-1].Price - //最大单价 - maxPrice := stepPrice.PriceRange[0].Price - //购买数步进基数 - stepPurchaseQuantity := *modelPriceInfo.PackedUnit - //购买数步进基数描述 - stepPurchaseQuantityDescription := "主体装箱数为步进基数" - //配件价格 - fittingPrice := int64(0) - if *modelPriceInfo.PartId > 0 { - fittingPriceInfo, ok := mapFitting[*modelPriceInfo.PartId] - if !ok { - return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("fitting price is not exists:%d", *modelPriceInfo.PartId)) + *modelInfo.PartList = strings.Trim(*modelInfo.PartList, ",") + mapFittingUnit := make(map[string]interface{}) + if *modelInfo.PartList != "" { + tmpPartIds, err := format.StrSlicToInt64Slice(strings.Split(*modelInfo.PartList, ",")) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse model part list!! ") } - //最小/最大价格要加配件 - fittingPrice = *fittingPriceInfo.Price - minPrice += fittingPrice - maxPrice += fittingPrice - //如果配件装箱基数比主体大，则基数以配件为主 - if *fittingPriceInfo.PackedUnit > stepPurchaseQuantity { - stepPurchaseQuantity = *fittingPriceInfo.PackedUnit - stepPurchaseQuantityDescription = "配件装箱数为步进基数" + for _, partId := range tmpPartIds { + fittingInfo, ok := mapFitting[*modelInfo.PartId] + if !ok { + return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("fitting price is not exists:%d", *modelInfo.PartId)) + } + mapFittingUnit[fmt.Sprintf("_%d", partId)] = map[string]interface{}{ + "packed_unit": *fittingInfo.PackedUnit, //装箱个数 + } } } - stepRange := make([]interface{}, 0, rangeLen) - for rIndex, rangeInfo := range stepPrice.PriceRange { - //最后一个 - if rIndex+1 == rangeLen { - begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity)) - stepRange = append(stepRange, map[string]interface{}{ - "start": rangeInfo.StartQuantity, - "end": rangeInfo.EndQuantity, - "range_description": fmt.Sprintf(">=%s Units", begin), - "item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3), - }) - break - } - begin := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.StartQuantity)) - end := format.NumToStringWithThousandthPercentile(fmt.Sprintf("%d", rangeInfo.EndQuantity)) - stepRange = append(stepRange, map[string]interface{}{ - "start": rangeInfo.StartQuantity, - "end": rangeInfo.EndQuantity, - "range_description": fmt.Sprintf("%s-%s Units", begin, end), - "item_price": format.CentitoDollar(rangeInfo.Price+fittingPrice, 3), - }) - } - //计算起购数量的单价 - _, itemPrice, err := l.svcCtx.Repositories.NewShoppingCart.CaculateStepPrice(stepPrice.MinBuyUnitsNum, stepPrice, fittingPrice) - if err != nil { - return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get min buy quantity item price") - } - mapRsp[fmt.Sprintf("_%d", *modelPriceInfo.SizeId)] = map[string]interface{}{ - "step_purchase_quantity": stepPurchaseQuantity, - "step_purchase_quantity_description": stepPurchaseQuantityDescription, - "min_price": minPrice, - "max_price": maxPrice, - "step_range": stepRange, - "min_buy_units_quantity": stepPrice.MinBuyUnitsNum, - "min_buy_units_quantity_total_price": format.CentitoDollarWithNoHalfAdjust(itemPrice*stepPrice.MinBuyUnitsNum, 2), - "min_buy_units_quantity_item_price": format.CentitoDollar(itemPrice, 3), + mapRsp[fmt.Sprintf("_%d", *modelInfo.SizeId)] = map[string]interface{}{ + "min_buy_units_quantity": stepPrice.MinBuyUnitsNum, //起购数量 + "main_packed_unit": *modelInfo.PackedUnit, //主体装箱数 + "fitting": mapFittingUnit, } } return resp.SetStatusWithMessage(basic.CodeOK, "success", mapRsp) diff --git a/server/product/internal/types/types.go b/server/product/internal/types/types.go index 59bcb8a7..e1951538 100644 --- a/server/product/internal/types/types.go +++ b/server/product/internal/types/types.go @@ -343,9 +343,9 @@ type CalculateProductPriceReq struct { } type CalculateProductPriceRsp struct { - ItemPrice string `json:"item_price"` - TotalPrice string `json:"total_price"` - PurchaseQuantity int64 `json:"purchase_quantity"` + ItemPrice string `json:"item_price"` + TotalPrice string `json:"total_price"` + StepRange interface{} `json:"step_range"` } type GetSizeByPidReq struct { diff --git a/server_api/product.api b/server_api/product.api index 23c3e8fd..68bc4033 100644 --- a/server_api/product.api +++ b/server_api/product.api @@ -394,9 +394,9 @@ type CalculateProductPriceReq { PurchaseQuantity int64 `json:"purchase_quantity"` } type CalculateProductPriceRsp { - ItemPrice string `json:"item_price"` - TotalPrice string `json:"total_price"` - PurchaseQuantity int64 `json:"purchase_quantity"` + ItemPrice string `json:"item_price"` + TotalPrice string `json:"total_price"` + StepRange interface{} `json:"step_range"` } //获取产品尺寸列表 type GetSizeByPidReq { From a9bb36d3942bde5677353e97d8e8a2e1e0251bdf Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 14:30:44 +0800 Subject: [PATCH 2/8] fix --- server/product/internal/logic/calculateproductpricelogic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/product/internal/logic/calculateproductpricelogic.go b/server/product/internal/logic/calculateproductpricelogic.go index 683e98f6..ed2886b3 100644 --- a/server/product/internal/logic/calculateproductpricelogic.go +++ b/server/product/internal/logic/calculateproductpricelogic.go @@ -115,7 +115,7 @@ func (l *CalculateProductPriceLogic) CalculateProductPrice(req *types.CalculateP return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateProductPriceRsp{ ItemPrice: format.CentitoDollar(itemPrice, 3), TotalPrice: format.CentitoDollarWithNoHalfAdjust(totalPrice, 2), - StepRange: stepPrice, + StepRange: stepRange, }) } From 6a35779bd52ee875b83ec7502c7fa85baf034e12 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 15:00:41 +0800 Subject: [PATCH 3/8] 11 --- .../internal/logic/ws_render_image.go | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 2d20f1e5..4888b8a9 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -85,18 +85,26 @@ func (w *wsConnectItem) consumeRenderImageData() { case <-w.closeChan: //已关闭 return case data := <-w.extendRenderProperty.renderChan: //消费数据 - logx.Info("准备执行任务。。。。。") limitChan <- struct{}{} - logx.Info("执行任务中。。。。。") go func(d websocket_data.RenderImageReqMsg) { defer func() { if err := recover(); err != nil { logx.Error("func renderImage panic:", err) } }() + tChan := make(chan struct{}, 1) + defer close(tChan) defer func() { <-limitChan }() + go func() { + select { + case <-w.extendRenderProperty.renderCtx.Done(): + panic("=========渲染取消旧的上下文=======") + case <-tChan: + return + } + }() w.renderImage(d) }(data) } @@ -159,25 +167,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe logx.Error("failed to get element ,", err) return } - //获取模板开关信息并且对于没有默认值的给赋值默认值(但凡DIY有一个是空的就要请求默认数据) - /*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) - if renderImageData.RenderData.Website == "" && templateSwitchInfo.MaterialData.Website.IfShow { - renderImageData.RenderData.Website = templateSwitchInfo.MaterialData.Website.DefaultValue - } - if renderImageData.RenderData.Phone == "" && templateSwitchInfo.MaterialData.Phone.IfShow { - renderImageData.RenderData.Phone = templateSwitchInfo.MaterialData.Phone.DefaultValue - } - if renderImageData.RenderData.Address == "" && templateSwitchInfo.MaterialData.Address.IfShow { - renderImageData.RenderData.Address = templateSwitchInfo.MaterialData.Address.DefaultValue - } - if renderImageData.RenderData.Qrcode == "" && templateSwitchInfo.MaterialData.QRcode.IfShow { - renderImageData.RenderData.Qrcode = templateSwitchInfo.MaterialData.QRcode.DefaultValue - } - if renderImageData.RenderData.Slogan == "" && templateSwitchInfo.MaterialData.Slogan.IfShow { - renderImageData.RenderData.Slogan = templateSwitchInfo.MaterialData.Slogan.DefaultValue - } - }*/ + //获取刀版图 combineReq := repositories.LogoCombineReq{ UserId: renderImageData.RenderData.UserId, From 7d3f614356bd81d9d0055318db79784284716d3f Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 15:09:49 +0800 Subject: [PATCH 4/8] 11 --- server/websocket/internal/logic/ws_render_image.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 4888b8a9..2d4fb7e6 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -89,7 +89,7 @@ func (w *wsConnectItem) consumeRenderImageData() { go func(d websocket_data.RenderImageReqMsg) { defer func() { if err := recover(); err != nil { - logx.Error("func renderImage panic:", err) + logx.Error("func renderImage main panic:", err) } }() tChan := make(chan struct{}, 1) @@ -98,6 +98,11 @@ func (w *wsConnectItem) consumeRenderImageData() { <-limitChan }() go func() { + defer func() { + if err := recover(); err != nil { + logx.Error("func renderImage panic:", err) + } + }() select { case <-w.extendRenderProperty.renderCtx.Done(): panic("=========渲染取消旧的上下文=======") From 9dbcf33cb982911db6ce37f90bfa44c24bc98c96 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 15:15:16 +0800 Subject: [PATCH 5/8] 11 --- server/websocket/internal/logic/ws_render_image.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 2d4fb7e6..d3de3753 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -92,8 +92,9 @@ func (w *wsConnectItem) consumeRenderImageData() { logx.Error("func renderImage main panic:", err) } }() - tChan := make(chan struct{}, 1) - defer close(tChan) + //临时chan用select io多路复用去判断携程退出 + tmpChan := make(chan struct{}, 1) + defer close(tmpChan) defer func() { <-limitChan }() @@ -106,7 +107,7 @@ func (w *wsConnectItem) consumeRenderImageData() { select { case <-w.extendRenderProperty.renderCtx.Done(): panic("=========渲染取消旧的上下文=======") - case <-tChan: + case <-tmpChan: return } }() From 550ca5b7b950645c34db5ae19799db7d234caba9 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 15:16:26 +0800 Subject: [PATCH 6/8] 11 --- server/websocket/internal/logic/ws_render_image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index d3de3753..ecfe1a45 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -24,7 +24,7 @@ var ( //每个websocket渲染任务缓冲队列长度默认值 renderChanLen = 500 //每个websocket渲染并发数 - renderChanConcurrency = 500 + renderChanConcurrency = 10 ) // 渲染处理器 From f980520ba770b66b82a39ec1a81529e35f147a66 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 15:16:49 +0800 Subject: [PATCH 7/8] 11 --- server/websocket/internal/logic/ws_render_image.go | 1 - 1 file changed, 1 deletion(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index ecfe1a45..6f3eb467 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -55,7 +55,6 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) { w.extendRenderProperty.selectColorIndex = renderImageData.RenderData.TemplateTagColor.SelectedColorIndex //让之前的失效 w.extendRenderProperty.renderCtxCancelFunc() - logx.Info("模板标签/颜色更换上下文取消") //重新赋值 w.extendRenderProperty.renderCtx, w.extendRenderProperty.renderCtxCancelFunc = context.WithCancel(w.logic.ctx) } From b0203593bbed8f0c7eab96f2268f638f077d0465 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sat, 7 Oct 2023 15:36:57 +0800 Subject: [PATCH 8/8] 11 --- server/websocket/internal/logic/ws_render_image.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 6f3eb467..da1e175e 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -84,6 +84,14 @@ func (w *wsConnectItem) consumeRenderImageData() { case <-w.closeChan: //已关闭 return case data := <-w.extendRenderProperty.renderChan: //消费数据 + //标签不一样 + if data.RenderData.TemplateTag != w.extendRenderProperty.templateTag { + continue + } + //颜色不一致 + if data.RenderData.TemplateTagColor.SelectedColorIndex != w.extendRenderProperty.selectColorIndex { + continue + } limitChan <- struct{}{} go func(d websocket_data.RenderImageReqMsg) { defer func() {