From ba0d812fb920d5176ce65a51d67aa207260892a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 13 Jun 2024 16:42:47 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 22 ++++++++--- business/partner/purchase/mtwm/order_afs.go | 41 +++++++++++---------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 22f51d437..e9646af90 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -246,13 +246,25 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m dao.UpdateEntity(db, order, "NewEarningPrice") } //美团订单如果有售后的话，订单完成后才能查到售后结算 + //if order.VendorID == model.VendorIDMTWM { + // if afsOrders, _ := dao.GetAfsOrders(db, order.VendorID, order.VendorOrderID, ""); len(afsOrders) > 0 { + // if handler := partner.GetPurchaseOrderHandlerFromVendorID(afsOrders[0].VendorID); handler != nil { + // if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, afsOrders[0].VendorOrderID, afsOrders[0].AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 { + // afsOrders[0].AfsTotalShopMoney = order.TotalShopMoney + orderAfsInfo.AfsTotalShopMoney + // dao.UpdateEntity(db, afsOrders[0], "AfsTotalShopMoney") + // order.TotalShopMoney = order.TotalShopMoney + orderAfsInfo.AfsTotalShopMoney + // } + // } + // } + //} if order.VendorID == model.VendorIDMTWM { if afsOrders, _ := dao.GetAfsOrders(db, order.VendorID, order.VendorOrderID, ""); len(afsOrders) > 0 { - if handler := partner.GetPurchaseOrderHandlerFromVendorID(afsOrders[0].VendorID); handler != nil { - if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, afsOrders[0].VendorOrderID, afsOrders[0].AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 { - afsOrders[0].AfsTotalShopMoney = order.TotalShopMoney + orderAfsInfo.AfsTotalShopMoney - dao.UpdateEntity(db, afsOrders[0], "AfsTotalShopMoney") - order.TotalShopMoney = order.TotalShopMoney + orderAfsInfo.AfsTotalShopMoney + for _, v := range afsOrders { + if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { + if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, v.VendorOrderID, v.AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 { + v.AfsTotalShopMoney = orderAfsInfo.AfsTotalShopMoney + } + dao.UpdateEntity(db, v, "AfsTotalShopMoney") } } } diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 519c0228e..ba2f96139 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -305,22 +305,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G return c.AdjustOrder(ctx, order, refundSkuList, reason) } -//func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, afsOrderID string) (orderAfsInfo *partner.OrderAfsInfo, err error) { -// orderAfsInfo = &partner.OrderAfsInfo{} -// var afsTotalShopMoney int64 -// if list, err := api.MtwmAPI.GetOrderRefundDetail(utils.Str2Int64(vendorOrderID), 0); err == nil { -// for _, v := range list { -// if v.RefundPartialEstimateCharge.SettleAmount != "" { -// afsTotalShopMoney += jxutils.StandardPrice2Int(utils.Str2Float64(v.RefundPartialEstimateCharge.SettleAmount)) -// } -// } -// } -// if order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDMTWM); err == nil { -// orderAfsInfo.AfsTotalShopMoney = order.TotalShopMoney + afsTotalShopMoney -// } -// return orderAfsInfo, err -//} - func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, afsOrderID string) (orderAfsInfo *partner.OrderAfsInfo, err error) { orderAfsInfo = &partner.OrderAfsInfo{} var afsTotalShopMoney int64 @@ -333,9 +317,28 @@ func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, } } } - if err == nil { - //orderAfsInfo.AfsTotalShopMoney = order.TotalShopMoney + afsTotalShopMoney - orderAfsInfo.AfsTotalShopMoney = afsTotalShopMoney + if order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDMTWM); err == nil { + orderAfsInfo.AfsTotalShopMoney = order.TotalShopMoney + afsTotalShopMoney } return orderAfsInfo, err } + +// +//func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, afsOrderID string) (orderAfsInfo *partner.OrderAfsInfo, err error) { +// orderAfsInfo = &partner.OrderAfsInfo{} +// var afsTotalShopMoney int64 +// order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDMTWM) +// +// if list, err := getAPI(order.VendorOrgCode, jxutils.GetShowStoreIDFromOrder(order), order.VendorStoreID).GetOrderRefundDetail(utils.Str2Int64(vendorOrderID), 0); err == nil { +// for _, v := range list { +// if v.RefundPartialEstimateCharge.SettleAmount != "" { +// afsTotalShopMoney += jxutils.StandardPrice2Int(utils.Str2Float64(v.RefundPartialEstimateCharge.SettleAmount)) +// } +// } +// } +// if err == nil { +// //orderAfsInfo.AfsTotalShopMoney = order.TotalShopMoney + afsTotalShopMoney +// orderAfsInfo.AfsTotalShopMoney = afsTotalShopMoney +// } +// return orderAfsInfo, err +//}