diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index d1c4a8586..0809b9a1d 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -135,42 +135,42 @@ func SplitUniversalOrderID(universalOrderID string) (orderID string, vendorID in func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) { vendorID = model.VendorIDUnknown - if vendorOrderIDInt64 := utils.Str2Int64WithDefault(vendorOrderID, 0); vendorOrderIDInt64 > 0 { - orderIDLen := len(vendorOrderID) - globals.SugarLogger.Debugf("GetPossibleVendorIDFromVendorOrderID, orderIDLen: %v", orderIDLen) - // 5287873015048 13 wsc - // 15380342248732 14 old ebai order - // 800402581000221 15,16 jd order - // 33437032333978492 17 mtwm order - // 3022716176275221584 19 elm order, new ebai order + //if vendorOrderIDInt64 := utils.Str2Int64WithDefault(vendorOrderID, 0); vendorOrderIDInt64 > 0 { + orderIDLen := len(vendorOrderID) + globals.SugarLogger.Debugf("GetPossibleVendorIDFromVendorOrderID, orderIDLen: %v", orderIDLen) + // 5287873015048 13 wsc + // 15380342248732 14 old ebai order + // 800402581000221 15,16 jd order + // 33437032333978492 17 mtwm order + // 3022716176275221584 19 elm order, new ebai order - // 京东到家从2020年开始订单号的长度都会在现有基础上加一位,订单号的前两位取的是当年的最后两位数(如:2020取的20),以适应业务的发展。 - // 改造点: - // 1、订单号位数变化,由原有15位数增加1位数调整为16位数,对接商家需检查是否有对订单号位数做长度校验。 - // 2、第一位数字发生变化,由原来9开头调整为当年年份后两位数如:2020年订单开头为20; - if orderIDLen == len("925265130002541") || orderIDLen == len("1925265130002541") { - vendorID = model.VendorIDJD - } else if orderIDLen == len("3022716176275221584") { - // vendorID = model.VendorIDELM - vendorID = model.VendorIDEBAI // 饿百零售开放平台订单接口中订单ID“order_id”字段长度将调整为19位,和饿了么订单ID“eleme_order_id”字段格式保持一致。 - } else if orderIDLen == len("15380342248732") { - if vendorOrderID[:2] == "88" { - vendorID = model.VendorIDJX - } else { - vendorID = model.VendorIDEBAI - } - } else if orderIDLen == len("33437032333978492") || orderIDLen == len("116379390766579767") { - vendorID = model.VendorIDMTWM - } else if orderIDLen == len("5287873015048") { - vendorID = model.VendorIDWSC - } else if orderIDLen == len("1000004390") { + // 京东到家从2020年开始订单号的长度都会在现有基础上加一位,订单号的前两位取的是当年的最后两位数(如:2020取的20),以适应业务的发展。 + // 改造点: + // 1、订单号位数变化,由原有15位数增加1位数调整为16位数,对接商家需检查是否有对订单号位数做长度校验。 + // 2、第一位数字发生变化,由原来9开头调整为当年年份后两位数如:2020年订单开头为20; + if orderIDLen == len("925265130002541") || orderIDLen == len("1925265130002541") { + vendorID = model.VendorIDJD + } else if orderIDLen == len("3022716176275221584") { + // vendorID = model.VendorIDELM + vendorID = model.VendorIDEBAI // 饿百零售开放平台订单接口中订单ID“order_id”字段长度将调整为19位,和饿了么订单ID“eleme_order_id”字段格式保持一致。 + } else if orderIDLen == len("15380342248732") { + if vendorOrderID[:2] == "88" { vendorID = model.VendorIDJX - } else if orderIDLen == len("18100216009800000001") { - vendorID = model.VendorIDJDShop + } else { + vendorID = model.VendorIDEBAI } - } else { - globals.SugarLogger.Debugf("GetPossibleVendorIDFromVendorOrderID, 2: %v", vendorOrderID) + } else if orderIDLen == len("33437032333978492") || orderIDLen == len("116379390766579767") { + vendorID = model.VendorIDMTWM + } else if orderIDLen == len("5287873015048") { + vendorID = model.VendorIDWSC + } else if orderIDLen == len("1000004390") { + vendorID = model.VendorIDJX + } else if orderIDLen == len("18100216009800000001") { + vendorID = model.VendorIDJDShop } + //} else { + // globals.SugarLogger.Debugf("GetPossibleVendorIDFromVendorOrderID, 2: %v", vendorOrderID) + //} return vendorID }