1
This commit is contained in:
@@ -30,12 +30,12 @@ const (
|
||||
VendorIDDada = 101 // 达达配送
|
||||
VendorIDMTPS = 102 // 美团配送
|
||||
VendorIDFengNiao = 103 // 蜂鸟配送
|
||||
VendorIDDYPS = 104 // 抖音配送
|
||||
VendorIDUUPT = 105 //uu跑腿
|
||||
VendorJXFakeWL = 300 // 京西假物流
|
||||
VendorIDJDWL = 401 // 京东物流
|
||||
VendorIDTotalWl = 402 // (综合物流[京东,圆通,申通....])
|
||||
VendorIDDeliveryEnd = 500
|
||||
//VendorIDDYPS = 104 // 抖音配送
|
||||
VendorIDUUPT = 105 //uu跑腿
|
||||
VendorJXFakeWL = 300 // 京西假物流
|
||||
VendorIDJDWL = 401 // 京东物流
|
||||
VendorIDTotalWl = 402 // (综合物流[京东,圆通,申通....])
|
||||
VendorIDDeliveryEnd = 500
|
||||
|
||||
VendorIDPrinterBegin = 201
|
||||
VendorIDFeiE = 201 // 飞鹅打印机
|
||||
@@ -102,8 +102,8 @@ var (
|
||||
VendorIDDada: "Dada",
|
||||
VendorIDMTPS: "Mtps",
|
||||
VendorIDFengNiao: "Fn",
|
||||
VendorIDDYPS: "DYPS",
|
||||
VendorIDUUPT: "UUPT",
|
||||
//VendorIDDYPS: "DYPS",
|
||||
VendorIDUUPT: "UUPT",
|
||||
|
||||
VendorIDFeiE: "Feie",
|
||||
VendorIDXiaoWM: "XiaoWM",
|
||||
@@ -136,8 +136,8 @@ var (
|
||||
VendorIDMTPS: "美团配送",
|
||||
VendorIDJDWL: "京东物流",
|
||||
VendorIDFengNiao: "蜂鸟配送",
|
||||
VendorIDDYPS: "抖音配送",
|
||||
VendorIDUUPT: "UU跑腿",
|
||||
//VendorIDDYPS: "抖音配送",
|
||||
VendorIDUUPT: "UU跑腿",
|
||||
|
||||
VendorIDFeiE: "飞鹅",
|
||||
VendorIDXiaoWM: "外卖管家",
|
||||
|
||||
@@ -525,9 +525,10 @@ func WaybillVendorID2Mask(vendorID int) (mask int8) {
|
||||
mask = OrderDeliveryFlagMaskDada
|
||||
} else if vendorID == VendorIDMTPS {
|
||||
mask = OrderDeliveryFlagMaskMtps
|
||||
} else if vendorID == VendorIDDYPS {
|
||||
mask = OrderDeliveryFlagMaskDYPS
|
||||
}
|
||||
//else if vendorID == VendorIDDYPS {
|
||||
// mask = OrderDeliveryFlagMaskDYPS
|
||||
//}
|
||||
return mask
|
||||
}
|
||||
|
||||
|
||||
@@ -299,8 +299,8 @@ var (
|
||||
VendorIDMTPS: BrandOpenMTPS,
|
||||
VendorIDDada: BrandOpenDaDa,
|
||||
VendorIDFengNiao: BrandOpenFN,
|
||||
VendorIDDYPS: BrandOpenDYPS,
|
||||
VendorIDUUPT: BrandOpenUUPT,
|
||||
//VendorIDDYPS: BrandOpenDYPS,
|
||||
VendorIDUUPT: BrandOpenUUPT,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interfac
|
||||
VendorOrderID: utils.Int64ToStr(req.ShopOrderID),
|
||||
OrderVendorID: model.VendorIDDD,
|
||||
VendorWaybillID: req.TrackNo,
|
||||
WaybillVendorID: model.VendorIDDYPS,
|
||||
WaybillVendorID: model.VendorIDDD,
|
||||
CourierName: req.RiderName,
|
||||
CourierMobile: req.RiderPhone,
|
||||
VendorStatus: utils.Int64ToStr(req.ShipmentStatus),
|
||||
|
||||
Reference in New Issue
Block a user