diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index c720a0680..cb3c5eda0 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -158,7 +158,7 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { } } //单独增加顺丰派送取消运单修改配送费逻辑 - if bill.WaybillVendorID == model.VendorIDSFPS && bill.Status == model.WaybillStatusCanceled { + if (bill.WaybillVendorID == model.VendorIDSFPS || bill.WaybillVendorID == model.VendorIDMTWM) && bill.Status == model.WaybillStatusCanceled { addParams["desired_fee"] = bill.DesiredFee addParams["actual_fee"] = bill.ActualFee } diff --git a/business/partner/partner_order.go b/business/partner/partner_order.go index 552130339..e4543148d 100644 --- a/business/partner/partner_order.go +++ b/business/partner/partner_order.go @@ -92,6 +92,8 @@ type IPurchasePlatformOrderHandler interface { // 获取各个平台订单的结算信息 GetOrderSettleAccounts(order *model.GoodsOrder) (int64, error) + // GetPlatformLogisticsFee 获取美团自配送订单的配送费 + GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) } type IAddWaybillTip interface { diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index a8856ba4e..4a79547ea 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -804,3 +804,8 @@ func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64 return utils.ForceInterface2Int64(orderMap["shop_fee"]), nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +} diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 6186d7418..2286d31cb 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -673,3 +673,8 @@ func (c *PurchaseHandler) GetOrderSettleAccounts(goods *model.GoodsOrder) (int64 } return settlement.SettlementAmount, nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +} diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index cd16bac49..2a2511edd 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -333,3 +333,8 @@ func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) { func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64, error) { return 0, nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +} diff --git a/business/partner/purchase/jx/order.go b/business/partner/purchase/jx/order.go index ec82bfbcd..01fa02392 100644 --- a/business/partner/purchase/jx/order.go +++ b/business/partner/purchase/jx/order.go @@ -160,3 +160,8 @@ func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) { func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64, error) { return 0, nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +} diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index b49e20007..7b736f1fd 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -849,7 +849,17 @@ func (c *PurchaseHandler) CancelLogisticsByWmOrderId(order *model.GoodsOrder, re // 获取订单配送状态 func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) { - return 0, nil + orderInfo, err := dao.GetSimpleOrder(dao.GetDB(), utils.Int64ToStr(orderId)) + if err != nil { + return 0, errors.New("获取本地门店账号信息失败,请重试") + } + + status, err := getAPI(orderInfo.VendorOrgCode, 0, "").OrderLogisticsStatus(orderId) + if err != nil { + return 0, err + } + + return status, nil } // GetOrderSettleAccounts 获取订单结算信息 @@ -868,3 +878,13 @@ func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64 } return 0, nil } + +// GetPlatformLogisticsFee 获取美团自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + fee, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderLogisticsFee(utils.Str2Int64(order.VendorOrderID)) + if err != nil { + return 0, err + } + + return utils.Float64TwoInt64(fee * 100), nil +} diff --git a/business/partner/purchase/mtwm/waybill.go b/business/partner/purchase/mtwm/waybill.go index 01be0cf0e..8dea3827d 100644 --- a/business/partner/purchase/mtwm/waybill.go +++ b/business/partner/purchase/mtwm/waybill.go @@ -55,10 +55,12 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal retVal.StatusTime = getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("timestamp"))) } - //if vendorStatus == "4" || vendorStatus == "8" { // 4:美团推送已经(确认骑手)订单 8:美团推送(骑手完成)订单 - // retVal.DesiredFee = utils.Float64TwoInt64(utils.Str2Float64WithDefault(msg.FormData.Get("shipping_fee"), 0)) // 订单优惠前的总费用 - // partner.CurOrderManager - //} + order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM) + if err == nil && order != nil { + fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order) + retVal.ActualFee = fee + retVal.DesiredFee = fee + } return retVal } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 9e7eb3327..d96c9faec 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -900,3 +900,8 @@ func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end return settlement, nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +} diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index eea07f2aa..a3897a633 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -1017,3 +1017,8 @@ func GetOrderDetail(appOrgCode, vendorOrderID string) (*order_orderDetail_respon func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64, error) { return 0, nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +} diff --git a/business/partner/purchase/yb/order.go b/business/partner/purchase/yb/order.go index 594f0f808..b619e317d 100644 --- a/business/partner/purchase/yb/order.go +++ b/business/partner/purchase/yb/order.go @@ -111,3 +111,8 @@ func (c *PurchaseHandler) OrderLogisticsStatus(orderId int64) (int64, error) { func (c *PurchaseHandler) GetOrderSettleAccounts(order *model.GoodsOrder) (int64, error) { return 0, nil } + +// GetPlatformLogisticsFee 获取自配送订单的配送费 +func (c *PurchaseHandler) GetPlatformLogisticsFee(order *model.GoodsOrder) (int64, error) { + return 0, nil +}