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

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-09-26 15:02:13 +08:00
commit 4dfeebeaed
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/product-template-tag/internal/logic/getproducttemplatetagslogic.go
View File

@ -106,7 +106,7 @@ func (l *GetProductTemplateTagsLogic) GetProductTemplateTags(req *types.GetProdu
for templateTag, _ := range mapMaterialTemplateTagColors { for templateTag, _ := range mapMaterialTemplateTagColors {
templateTagNameList = append(templateTagNameList, templateTag) 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 { if err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get template tags") 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 { for k, v := range productTemplateTags {
if templateTagStr == *v.TemplateTag { if templateTagStr == *v.TemplateTag {
productTemplateTags[k], productTemplateTags[index] = productTemplateTags[index], productTemplateTags[k] productTemplateTags[k], productTemplateTags[index] = productTemplateTags[index], productTemplateTags[k]
break
} }
} }
} }

2
server_api/product.api
View File

@ -44,7 +44,7 @@ service product {
//获取产品模型信息 //获取产品模型信息
@handler GetModelByPidHandler @handler GetModelByPidHandler
get /api/product/get_model_by_pid(GetModelByPidReq) returns (response); get /api/product/get_model_by_pid(GetModelByPidReq) returns (response);
//获取产品阶梯价格列表 //获取产品阶梯价格列表(即将废弃)
@handler GetPriceByPidHandler @handler GetPriceByPidHandler
get /api/product/get_price_by_pid(GetPriceByPidReq) returns (response); get /api/product/get_price_by_pid(GetPriceByPidReq) returns (response);
//获取产品阶梯价格信息 //获取产品阶梯价格信息

1
service/repositories/order.go
View File

@ -1111,7 +1111,6 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
} }
} }
snapshot["template_info"] = snapshotTemplateInfoJson snapshot["template_info"] = snapshotTemplateInfoJson
orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshot.Snapshot = nil
orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshotInfo = snapshot orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshotInfo = snapshot
} }
orderDetail.OrderInfo.StatusLink = order.GetOrderStatusLinkUser(orderDetail.OrderInfo.DeliveryMethod, orderDetail.OrderInfo.StatusLink) orderDetail.OrderInfo.StatusLink = order.GetOrderStatusLinkUser(orderDetail.OrderInfo.DeliveryMethod, orderDetail.OrderInfo.StatusLink)