diff --git a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go index 8e70d0d9..d97c768a 100644 --- a/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go +++ b/server/product-template-tag/internal/logic/getproducttemplatetagslogic.go @@ -106,7 +106,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu for templateTag, _ := range mapMaterialTemplateTagColors { templateTagNameList = append(templateTagNameList, templateTag) } - productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, req.Limit, 1, "id DESC") + productTemplateTags, err = l.svcCtx.AllModels.FsProductTemplateTags.GetListByTagNames(l.ctx, templateTagNameList, len(templateTagNameList), 1, "id DESC") if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get template tags") @@ -135,6 +135,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu for k, v := range productTemplateTags { if templateTagStr == *v.TemplateTag { productTemplateTags[k], productTemplateTags[index] = productTemplateTags[index], productTemplateTags[k] + break } } } diff --git a/server_api/product.api b/server_api/product.api index 0fe9971e..687400ef 100644 --- a/server_api/product.api +++ b/server_api/product.api @@ -44,7 +44,7 @@ service product { //获取产品模型信息 @handler GetModelByPidHandler get /api/product/get_model_by_pid(GetModelByPidReq) returns (response); - //获取产品阶梯价格列表 + //获取产品阶梯价格列表(即将废弃) @handler GetPriceByPidHandler get /api/product/get_price_by_pid(GetPriceByPidReq) returns (response); //获取产品阶梯价格信息 diff --git a/service/repositories/order.go b/service/repositories/order.go index ce264e79..b7abc1d0 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -1111,7 +1111,6 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel } } snapshot["template_info"] = snapshotTemplateInfoJson - orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshot.Snapshot = nil orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshotInfo = snapshot } orderDetail.OrderInfo.StatusLink = order.GetOrderStatusLinkUser(orderDetail.OrderInfo.DeliveryMethod, orderDetail.OrderInfo.StatusLink)