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-04-16 16:06:12 +08:00
parent a9a62e6c65
commit 3f290a5b77
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -949,7 +949,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
var afsSkuList []*model.OrderSkuFinancial var afsSkuList []*model.OrderSkuFinancial
var orderSkuList4Afs []*dao.OrderSkuWithActualPayPrice var orderSkuList4Afs []*dao.OrderSkuWithActualPayPrice
if len(vendorOrderIDs) > 0 { if len(vendorOrderIDs) > 0 {
afsSkuList, err = dao.GetStoreAfsOrderSkuList2(db, vendorOrderIDs) afsSkuList, err = dao.GetStoreAfsOrderSkuList2(db, vendorOrderIDs) // 售后成功商品列表
orderSkuList4Afs, err = dao.GetStoreOrderSkuList4Afs2(db, vendorOrderIDs) orderSkuList4Afs, err = dao.GetStoreOrderSkuList4Afs2(db, vendorOrderIDs)
} }

6
business/partner/purchase/ebai/order.go
View File

@@ -129,6 +129,7 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
task.GetResult(0) task.GetResult(0)
if err1 == nil { if err1 == nil {
order = p.Map2Order(result1) order = p.Map2Order(result1)
globals.SugarLogger.Debugf("========order1:= %s", utils.Format4Output(order, false))
if err2 == nil { if err2 == nil {
skuHave := make([]*model.OrderSku, 0, 0) skuHave := make([]*model.OrderSku, 0, 0)
refundSkuList := p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"]) refundSkuList := p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"])
@@ -143,6 +144,9 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
} }
} }
} }
globals.SugarLogger.Debugf("========skuHave:= %s", utils.Format4Output(skuHave, false))
globals.SugarLogger.Debugf("========refundSkuList:= %s", utils.Format4Output(refundSkuList, false))
order.Skus = append(order.Skus, skuHave...) order.Skus = append(order.Skus, skuHave...)
giftSkus, discountMoney := getZengSkus(vendorOrderID, result1) giftSkus, discountMoney := getZengSkus(vendorOrderID, result1)
order.DiscountMoney = discountMoney order.DiscountMoney = discountMoney
@@ -156,6 +160,7 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
} else { } else {
err = err1 err = err1
} }
globals.SugarLogger.Debugf("========order2:= %s", utils.Format4Output(order, false))
return order, err return order, err
} }
@@ -556,6 +561,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.
if status.Status == model.OrderStatusAdjust { if status.Status == model.OrderStatusAdjust {
var order *model.GoodsOrder var order *model.GoodsOrder
order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg)) order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg))
globals.SugarLogger.Debugf("======order4=:= %s", utils.Format4Output(order, false))
if err == nil { if err == nil {
err = partner.CurOrderManager.OnOrderAdjust(order, status) err = partner.CurOrderManager.OnOrderAdjust(order, status)
} }