This commit is contained in:
邹宗楠
2024-11-29 17:57:50 +08:00
parent 46b1897e89
commit 4c6e86a762
2 changed files with 2 additions and 16 deletions

View File

@@ -64,21 +64,6 @@ const (
VendorIDShowAPI = 325 // 万维易源 VendorIDShowAPI = 325 // 万维易源
WayBillDeliveryMarkUp = 20 // 运单加价两毛钱 WayBillDeliveryMarkUp = 20 // 运单加价两毛钱
// 美团配送门店配送方式
MTWMStorePSWay1 = "1003" //美团跑腿(众包)
MTWMStorePSWay2 = "1001" //专送(加盟)
MTWMStorePSWay3 = "1002" //专送(自建)
MTWMStorePSWay4 = "1004" //城市代理
MTWMStorePSWay5 = "2002" //快送
MTWMStorePSWay6 = "2010" //全城送
MTWMStorePSWay7 = "0000" //商家自配
MTWMStorePSWay8 = "3001" //混合送(专送+快送)
MTWMStorePSWay9 = "30011002" //混合自建
MTWMStorePSWay10 = "30011001" //混合加盟
MTWMStorePSWay11 = "30012002" //混合快送
MTWMStorePSWay12 = "0002" //趣生活美食配送
MTWMStorePSWay13 = "0016" //达达快递
MTWMStorePSWay14 = "0033" //E_代送
) )
const BrandIdChengShan = 142 // 成山农场品牌id const BrandIdChengShan = 142 // 成山农场品牌id

View File

@@ -587,6 +587,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
return err return err
} }
// 美团配送门店配送方式
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
orderDetail, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderGetOrderDetail(utils.Str2Int64(order.VendorOrderID), false) orderDetail, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderGetOrderDetail(utils.Str2Int64(order.VendorOrderID), false)
if err != nil { if err != nil {
@@ -595,7 +596,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
// 美团专送、快送、混合送、美团企客 // 美团专送、快送、混合送、美团企客
logisticsCode := utils.Interface2String(orderDetail["logistics_code"]) logisticsCode := utils.Interface2String(orderDetail["logistics_code"])
isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe || logisticsCode == mtwmapi.PeiSongTypeMixedExpressQiKe isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSPT || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe || logisticsCode == mtwmapi.PeiSongTypeMixedExpressQiKe
//1001-专送加盟1002-专送(自建) //1001-专送加盟1002-专送(自建)
//2002-快送3001-混合送(专送+快送) //2002-快送3001-混合送(专送+快送)
//4015-企客远距离配送 //4015-企客远距离配送