diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index f0b4a12e2..849255137 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -293,11 +293,7 @@ func IsLegalStoreID(id int) bool { // 将规格转为重量 func FormatSkuWeight(specQuality float32, specUnit string) int { - lowerSpecUnit := strings.ToLower(specUnit) - if lowerSpecUnit == "kg" || lowerSpecUnit == "l" { - specQuality *= 1000 - } - return int(specQuality) + return RegularizeSkuQuality(specQuality, specUnit) } type SkuList []*model.Sku @@ -348,7 +344,7 @@ func GuessVendorIDFromVendorStoreID(vendorStoreID int64) (vendorID int) { vendorID = model.VendorIDJD } else if vendorStoreID > 1234567 && vendorStoreID < 9876543 { // 美团外卖 2461713,7位 vendorID = model.VendorIDMTWM - } else if vendorStoreID > 1234567890 && vendorStoreID < 9987654321 { // 饿百 2167002607,10位 + } else if vendorStoreID > 1234567890 && vendorStoreID < 99876543210 { // 饿百 2167002607,10位,11位 vendorID = model.VendorIDEBAI } else if vendorStoreID > 123456789 && vendorStoreID < 987654321 { // 微盟微商城 132091048,9位 vendorID = model.VendorIDWSC diff --git a/business/model/const.go b/business/model/const.go index a48b1b0fc..482089873 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -113,10 +113,10 @@ var ( OrderStatusFinished: "完成", OrderStatusCanceled: "取消", - AfsOrderStatusWait4Approve: "售后待审", - AfsOrderStatusNew: "新售后单", - AfsOrderStatusWait4ReceiveGoods: "售后待确认收货", - AfsOrderStatusReceivedGoods: "售后已收货", + AfsOrderStatusWait4Approve: "待审核", + AfsOrderStatusNew: "已审核", + AfsOrderStatusWait4ReceiveGoods: "退货待确认", + AfsOrderStatusReceivedGoods: "退货已收到", AfsOrderStatusFinished: "售后成功", AfsOrderStatusFailed: "售后失败", }