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-10-11 12:23:46 +08:00
commit 2d897d26d0
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
constants/orders.go
View File

@ -95,11 +95,11 @@ var OrderStatusUserCLOUDSTORE []OrderStatusCode
func init() { func init() {
// 订单状态名称 // 订单状态名称
OrderPayStatusMessage = make(map[OrderPayStatusCode]string) OrderPayStatusMessage = make(map[OrderPayStatusCode]string)
OrderPayStatusMessage[ORDER_PAY_STATUS_UNPAIDDEPOSIT] = "未付首款" OrderPayStatusMessage[ORDER_PAY_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid"
OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDEPOSIT] = "已付首款" OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDEPOSIT] = "Deposit Payment Paid"
OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDDEPOSIT] = "已退首款" OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDDEPOSIT] = "Deposit Payment Refunded"
OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDREMAINING] = "已付尾款" OrderPayStatusMessage[ORDER_PAY_STATUS_PAIDDREMAINING] = "Final Payment Paid"
OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDREMAINING] = "已退尾款" OrderPayStatusMessage[ORDER_PAY_STATUS_REFUNDEDREMAINING] = "Final Payment Refunded"
// 订单状态名称 // 订单状态名称
PayStatusMessage = make(map[PayStatusCode]string) PayStatusMessage = make(map[PayStatusCode]string)
@ -109,23 +109,23 @@ func init() {
// 订单状态名称 // 订单状态名称
OrderStatusMessage = make(map[OrderStatusCode]string) OrderStatusMessage = make(map[OrderStatusCode]string)
OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "未支付定金" OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid"
OrderStatusMessage[ORDER_STATUS_CLOSE] = "订单已关闭" OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed"
OrderStatusMessage[ORDER_STATUS_COMPLETE] = "订单已完成" OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed"
OrderStatusMessage[ORDER_STATUS_DELETE] = "订单已删除" OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted"
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "直邮单--已下单" OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Order" //直邮单--已下单
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "直邮单--已下单--尾款" OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid" //直邮单--已下单--尾款
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "直邮单--开始生产" OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" //直邮单--开始生产
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "直邮单--生产完成" OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" //直邮单--生产完成
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "直邮单--已发货" OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" //直邮单--已发货
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "直邮单--已到达" OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "Delivered" //直邮单--已到达
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "云仓单--已下单" OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "Order" //云仓单--已下单
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "云仓单--已下单-尾款" OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "Final Payment Paid" // 云仓单--已下单-尾款
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "云仓单--开始生产" OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "Start Production" //云仓单--开始生产
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "云仓单--生产完成" OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "Production Complete" // 云仓单--生产完成
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "云仓单--直达仓库" OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" //云仓单--直达仓库
// 订单状态--用户可见--直邮 // 订单状态--用户可见--直邮
OrderStatusUserDIRECTMAIL = []OrderStatusCode{ OrderStatusUserDIRECTMAIL = []OrderStatusCode{

5
server/product/internal/logic/gettagproductlistlogic.go
View File

@ -172,7 +172,7 @@ func (l *GetTagProductListLogic) getProductRelationInfo(req getProductRelationIn
IsDel: &pIsDel, IsDel: &pIsDel,
IsShelf: &pIsShelf, IsShelf: &pIsShelf,
Status: &pStatus, Status: &pStatus,
OrderBy: "`is_recommend` DESC,`sort` ASC", OrderBy: "`sort` ASC", //产品序号升序排序
}) })
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
@ -312,6 +312,7 @@ func (l *GetTagProductListLogic) dealWithTagMenuData(req dealWithTagMenuDataReq)
//tag中产品 //tag中产品
for _, tmpProduct := range productListRsp { for _, tmpProduct := range productListRsp {
tagTem.TagProductList = append(tagTem.TagProductList, tmpProduct.ProductId) 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{}) mapTypeId := make(map[int64]struct{})
for _, v2 := range mapTagLevel { for _, v2 := range mapTagLevel {
if strings.Contains(v2.LevelPrefix, v.LevelPrefix) { if strings.Contains(v2.LevelPrefix, v.LevelPrefix) {
mapTypeId[v.TypeId] = struct{}{} mapTypeId[v2.TypeId] = struct{}{}
} }
} }
for _, p := range productList { for _, p := range productList {