liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-06-13 16:42:47 +08:00
parent 6e98477c0c
commit ba0d812fb9
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxcallback/orderman/order.go
View File

@@ -246,13 +246,25 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
dao.UpdateEntity(db, order, "NewEarningPrice") 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 order.VendorID == model.VendorIDMTWM {
if afsOrders, _ := dao.GetAfsOrders(db, order.VendorID, order.VendorOrderID, ""); len(afsOrders) > 0 { if afsOrders, _ := dao.GetAfsOrders(db, order.VendorID, order.VendorOrderID, ""); len(afsOrders) > 0 {
if handler := partner.GetPurchaseOrderHandlerFromVendorID(afsOrders[0].VendorID); handler != nil { for _, v := range afsOrders {
if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, afsOrders[0].VendorOrderID, afsOrders[0].AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 { if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil {
afsOrders[0].AfsTotalShopMoney = order.TotalShopMoney + orderAfsInfo.AfsTotalShopMoney if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, v.VendorOrderID, v.AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 {
dao.UpdateEntity(db, afsOrders[0], "AfsTotalShopMoney") v.AfsTotalShopMoney = orderAfsInfo.AfsTotalShopMoney
order.TotalShopMoney = order.TotalShopMoney + orderAfsInfo.AfsTotalShopMoney }
dao.UpdateEntity(db, v, "AfsTotalShopMoney")
} }
} }
} }

41
business/partner/purchase/mtwm/order_afs.go
View File

@@ -305,22 +305,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
return c.AdjustOrder(ctx, order, refundSkuList, reason) 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) { func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID, afsOrderID string) (orderAfsInfo *partner.OrderAfsInfo, err error) {
orderAfsInfo = &partner.OrderAfsInfo{} orderAfsInfo = &partner.OrderAfsInfo{}
var afsTotalShopMoney int64 var afsTotalShopMoney int64
@@ -333,9 +317,28 @@ func (c *PurchaseHandler) GetOrderAfsInfo(ctx *jxcontext.Context, vendorOrderID,
} }
} }
} }
if err == nil { if order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDMTWM); err == nil {
//orderAfsInfo.AfsTotalShopMoney = order.TotalShopMoney + afsTotalShopMoney orderAfsInfo.AfsTotalShopMoney = order.TotalShopMoney + afsTotalShopMoney
orderAfsInfo.AfsTotalShopMoney = afsTotalShopMoney
} }
return orderAfsInfo, err 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
//}