diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index d7e65d064..10f15435c 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -298,6 +298,9 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao. } for _, v := range orderSkus { + v.VendorOrderID = order.VendorOrderID + v.VendorID = order.VendorID + intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0) if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code skuBindInfo := skumapper[intVendorSkuID] diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index f061fa842..08e6ea78f 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -265,7 +265,13 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af } for _, v := range orderSkus { v.AfsOrderID = order.AfsOrderID + v.VendorID = order.VendorID + v.VendorOrderID = order.VendorOrderID + v.IsAfsOrder = 1 + v.VendorStoreID = order.VendorStoreID + v.StoreID = order.StoreID v.JxStoreID = jxStoreID + intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0) if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code skuBindInfo := skumapper[intVendorSkuID] diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index fc74967c1..5d13a3256 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -81,20 +81,20 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia } for _, sku := range partRefundData.RefundProducts { orderSku := &model.OrderSkuFinancial{ - VendorID: model.VendorIDEBAI, - AfsOrderID: afsOrder.AfsOrderID, - VendorOrderID: afsOrder.VendorOrderID, - VendorStoreID: afsOrder.VendorStoreID, - StoreID: afsOrder.StoreID, - Count: sku.Number, + // VendorID: model.VendorIDEBAI, + // AfsOrderID: afsOrder.AfsOrderID, + // VendorOrderID: afsOrder.VendorOrderID, + // VendorStoreID: afsOrder.VendorStoreID, + // StoreID: afsOrder.StoreID, + // IsAfsOrder: 1, + Count: sku.Number, // ConfirmTime: afsOrder.AfsCreateAt, VendorSkuID: sku.SkuID, SkuID: int(utils.Str2Int64WithDefault(sku.CustomSkuID, 0)), Name: sku.Name, UserMoney: sku.TotalRefund, PmSkuSubsidyMoney: sku.ShopEleRefund, - IsAfsOrder: 1, } afsOrder.SkuUserMoney += orderSku.UserMoney afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney @@ -104,6 +104,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDEBAI); err2 == nil { afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg) cancelData := msg.Data.(*ebaiapi.CBUserCancelInfo) + afsOrder.AfsOrderID = orderStatus.VendorOrderID afsOrder.RefundType = model.AfsTypeFullRefund afsOrder.AppealType = model.AfsAppealTypeRefund afsOrder.VendorReasonType = "" diff --git a/business/partner/purchase/jd/order_afs.go b/business/partner/purchase/jd/order_afs.go index e35117a5b..c0b73c099 100644 --- a/business/partner/purchase/jd/order_afs.go +++ b/business/partner/purchase/jd/order_afs.go @@ -144,20 +144,20 @@ func (c *PurchaseHandler) buildAfsOrder(afsInfo *jdapi.AfsServiceResponse) (afsO for _, x := range afsInfo.AfsDetailList { orderSku := &model.OrderSkuFinancial{ - VendorID: model.VendorIDJD, - AfsOrderID: afsOrder.AfsOrderID, - VendorOrderID: afsOrder.VendorOrderID, - VendorStoreID: afsOrder.VendorStoreID, - StoreID: afsOrder.StoreID, - Count: x.SkuCount, + // VendorID: model.VendorIDJD, + // AfsOrderID: afsOrder.AfsOrderID, + // VendorOrderID: afsOrder.VendorOrderID, + // VendorStoreID: afsOrder.VendorStoreID, + // StoreID: afsOrder.StoreID, + // IsAfsOrder: 1, + Count: x.SkuCount, // ConfirmTime: afsOrder.AfsCreateAt, VendorSkuID: utils.Int64ToStr(x.WareID), SkuID: int(utils.Str2Int64WithDefault(x.SkuIDIsv, 0)), Name: x.WareName, UserMoney: x.AfsMoney, PmSkuSubsidyMoney: x.PlatPayMoney, - IsAfsOrder: 1, } afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney orderSku.PmSubsidyMoney += orderSku.PmSkuSubsidyMoney diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index cf439ac16..e8f365071 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -78,20 +78,19 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma } for _, sku := range refundData.FoodList { orderSku := &model.OrderSkuFinancial{ - VendorID: model.VendorIDMTWM, - AfsOrderID: afsOrder.AfsOrderID, - VendorOrderID: afsOrder.VendorOrderID, - VendorStoreID: afsOrder.VendorStoreID, - StoreID: afsOrder.StoreID, - Count: sku.Count, + // VendorID: model.VendorIDMTWM, + // AfsOrderID: afsOrder.AfsOrderID, + // VendorOrderID: afsOrder.VendorOrderID, + // VendorStoreID: afsOrder.VendorStoreID, + // StoreID: afsOrder.StoreID, + // IsAfsOrder: 1, + Count: sku.Count, // ConfirmTime: afsOrder.AfsCreateAt, VendorSkuID: sku.SkuID, SkuID: int(utils.Str2Int64WithDefault(sku.SkuID, 0)), Name: sku.FoodName, - IsAfsOrder: 1, - - UserMoney: jxutils.StandardPrice2Int(sku.RefundPrice)*int64(sku.Count) + jxutils.StandardPrice2Int(sku.BoxPrice)*int64(sku.BoxNum), + UserMoney: jxutils.StandardPrice2Int(sku.RefundPrice)*int64(sku.Count) + jxutils.StandardPrice2Int(sku.BoxPrice)*int64(sku.BoxNum), } afsOrder.SkuUserMoney += orderSku.UserMoney afsOrder.Skus = append(afsOrder.Skus, orderSku) @@ -100,7 +99,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma } else { if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDMTWM); err2 == nil { afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg.FormData) - afsOrder.AfsOrderID = "" + afsOrder.AfsOrderID = orderStatus.VendorOrderID afsOrder.RefundType = model.AfsTypeFullRefund afsOrder.AppealType = model.AfsAppealTypeRefund afsOrder.VendorReasonType = ""