From b86d6748b48936c01c35f182cc8ae5c68b2408a9 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Wed, 11 Oct 2023 12:10:08 +0800 Subject: [PATCH 1/4] fix --- server/product/internal/logic/gettagproductlistlogic.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/product/internal/logic/gettagproductlistlogic.go b/server/product/internal/logic/gettagproductlistlogic.go index 73d75f9c..ef025139 100644 --- a/server/product/internal/logic/gettagproductlistlogic.go +++ b/server/product/internal/logic/gettagproductlistlogic.go @@ -312,6 +312,7 @@ func (l *GetTagProductListLogic) dealWithTagMenuData(req dealWithTagMenuDataReq) //tag中产品 for _, tmpProduct := range productListRsp { tagTem.TagProductList = append(tagTem.TagProductList, tmpProduct.ProductId) + req.MapTagProduct[tmpProduct.ProductId] = tmpProduct } } //加入分类 @@ -354,7 +355,7 @@ func (l *GetTagProductListLogic) organizationLevelRelation(minLevel int, mapTagL mapTypeId := make(map[int64]struct{}) for _, v2 := range mapTagLevel { if strings.Contains(v2.LevelPrefix, v.LevelPrefix) { - mapTypeId[v.TypeId] = struct{}{} + mapTypeId[v2.TypeId] = struct{}{} } } for _, p := range productList { From c04231d6d7066644683756a89cb047ab505ef61f Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Wed, 11 Oct 2023 12:11:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E7=AE=97=E6=B3=95=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/orders.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/constants/orders.go b/constants/orders.go index 17c83e1a..516f10ae 100644 --- a/constants/orders.go +++ b/constants/orders.go @@ -95,11 +95,11 @@ var OrderStatusUserCLOUDSTORE []OrderStatusCode func init() { // 订单状态名称 OrderPayStatusMessage = make(map[OrderPayStatusCode]string) - OrderPayStatusMessage[ORDER_PAY_STATUS_UNPAIDDEPOSIT] = "未付首款" - OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDEPOSIT] = "已付首款" - OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDDEPOSIT] = "已退首款" - OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDREMAINING] = "已付尾款" - OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDREMAINING] = "已退尾款" + OrderPayStatusMessage[ORDER_PAY_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" + OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDEPOSIT] = "Deposit Payment Paid" + OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDDEPOSIT] = "Deposit Payment Refunded" + OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDREMAINING] = "Final Payment Paid" + OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDREMAINING] = "Final Payment Refunded" // 订单状态名称 PayStatusMessage = make(map[PayStatusCode]string) @@ -109,23 +109,23 @@ func init() { // 订单状态名称 OrderStatusMessage = make(map[OrderStatusCode]string) - OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "未支付定金" - OrderStatusMessage[ORDER_STATUS_CLOSE] = "订单已关闭" - OrderStatusMessage[ORDER_STATUS_COMPLETE] = "订单已完成" - OrderStatusMessage[ORDER_STATUS_DELETE] = "订单已删除" + OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" + OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed" + OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed" + OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted" - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "直邮单--已下单" - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "直邮单--已下单--尾款" - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "直邮单--开始生产" - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "直邮单--生产完成" - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "直邮单--已发货" - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "直邮单--已到达" + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Order" //直邮单--已下单 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid" //直邮单--已下单--尾款 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" //直邮单--开始生产 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" //直邮单--生产完成 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" //直邮单--已发货 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "Delivered" //直邮单--已到达 - OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "云仓单--已下单" - OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "云仓单--已下单-尾款" - OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "云仓单--开始生产" - OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "云仓单--生产完成" - OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "云仓单--直达仓库" + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "Order" //云仓单--已下单 + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "Final Payment Paid" // 云仓单--已下单-尾款 + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "Start Production" //云仓单--开始生产 + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "Production Complete" // 云仓单--生产完成 + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" //云仓单--直达仓库 // 订单状态--用户可见--直邮 OrderStatusUserDIRECTMAIL = []OrderStatusCode{ From 2f45b83ba33e6d3da844541f4066a849db53d0e0 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Wed, 11 Oct 2023 12:16:54 +0800 Subject: [PATCH 3/4] fix --- server/product/internal/logic/gettagproductlistlogic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/product/internal/logic/gettagproductlistlogic.go b/server/product/internal/logic/gettagproductlistlogic.go index ef025139..87d7ea1b 100644 --- a/server/product/internal/logic/gettagproductlistlogic.go +++ b/server/product/internal/logic/gettagproductlistlogic.go @@ -172,7 +172,7 @@ func (l *GetTagProductListLogic) getProductRelationInfo(req getProductRelationIn IsDel: &pIsDel, IsShelf: &pIsShelf, Status: &pStatus, - OrderBy: "`is_recommend` DESC,`sort` ASC", + OrderBy: "`sort` ASC", }) if err != nil { logx.Error(err) From a6f0d49c6e5db0c375ee701a46778c2057182abb Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Wed, 11 Oct 2023 12:20:38 +0800 Subject: [PATCH 4/4] fix --- server/product/internal/logic/gettagproductlistlogic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/product/internal/logic/gettagproductlistlogic.go b/server/product/internal/logic/gettagproductlistlogic.go index 87d7ea1b..eae2abfb 100644 --- a/server/product/internal/logic/gettagproductlistlogic.go +++ b/server/product/internal/logic/gettagproductlistlogic.go @@ -172,7 +172,7 @@ func (l *GetTagProductListLogic) getProductRelationInfo(req getProductRelationIn IsDel: &pIsDel, IsShelf: &pIsShelf, Status: &pStatus, - OrderBy: "`sort` ASC", + OrderBy: "`sort` ASC", //产品序号升序排序 }) if err != nil { logx.Error(err)