diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index bff8a6251..ea3aa27ea 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -94,11 +94,11 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m c.pushToGy(msg) return mtpsapi.SuccessResponse } - // 多次取消,只处理第一次 - if msg.Status == mtpsapi.OrderStatusCanceled { + // 多次取消,送达,只处理第一次 + if msg.Status == mtpsapi.OrderStatusCanceled || msg.Status == mtpsapi.OrderStatusDeliverred { orderStatus, _ := orderman.FixedOrderManager.GetWayBillStatusList(msg.OrderID, msg.MtPeisongID, model.VendorIDMTPS) for _, v := range orderStatus { - if v.VendorStatus == "99" { + if v.VendorStatus == utils.Int64ToStr(mtpsapi.OrderStatusCanceled) || v.VendorStatus == utils.Int64ToStr(mtpsapi.OrderStatusDeliverred) { return mtpsapi.SuccessResponse } } diff --git a/business/partner/purchase/mtwm/financial.go b/business/partner/purchase/mtwm/financial.go index 918911506..a694fe8d7 100644 --- a/business/partner/purchase/mtwm/financial.go +++ b/business/partner/purchase/mtwm/financial.go @@ -154,6 +154,10 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( } else { err = nil } + + // 区分门店是否为报价门店 + // 报价门店商品如果京西系统存在则不管,不存在则获取平台上填写的进货价 + if result["package_bag_money"] != nil { orderFinancial.BoxMoney = utils.MustInterface2Int64(result["package_bag_money"]) }