From 4ad695743d4f3d1818c55408fda45c7e8c926727 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 28 May 2019 11:15:45 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=8F=B7=E5=8F=AF=E8=83=BD=E6=98=AF10=E4=BD=8D=E6=88=9611?= =?UTF-8?q?=E4=BD=8D=20-=20=E9=87=8D=E6=96=B0=E5=91=BD=E5=90=8D=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils_cms.go | 8 ++------ business/model/const.go | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) 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: "售后失败", }