- 售后单sku中与afsOrder相同的信息,统一在updateAfsOrderSkuOtherInfo中刷新
This commit is contained in:
@@ -298,6 +298,9 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, v := range orderSkus {
|
for _, v := range orderSkus {
|
||||||
|
v.VendorOrderID = order.VendorOrderID
|
||||||
|
v.VendorID = order.VendorID
|
||||||
|
|
||||||
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
||||||
if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
|
if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
|
||||||
skuBindInfo := skumapper[intVendorSkuID]
|
skuBindInfo := skumapper[intVendorSkuID]
|
||||||
|
|||||||
@@ -265,7 +265,13 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af
|
|||||||
}
|
}
|
||||||
for _, v := range orderSkus {
|
for _, v := range orderSkus {
|
||||||
v.AfsOrderID = order.AfsOrderID
|
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
|
v.JxStoreID = jxStoreID
|
||||||
|
|
||||||
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
||||||
if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
|
if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
|
||||||
skuBindInfo := skumapper[intVendorSkuID]
|
skuBindInfo := skumapper[intVendorSkuID]
|
||||||
|
|||||||
@@ -81,20 +81,20 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
|
|||||||
}
|
}
|
||||||
for _, sku := range partRefundData.RefundProducts {
|
for _, sku := range partRefundData.RefundProducts {
|
||||||
orderSku := &model.OrderSkuFinancial{
|
orderSku := &model.OrderSkuFinancial{
|
||||||
VendorID: model.VendorIDEBAI,
|
// VendorID: model.VendorIDEBAI,
|
||||||
AfsOrderID: afsOrder.AfsOrderID,
|
// AfsOrderID: afsOrder.AfsOrderID,
|
||||||
VendorOrderID: afsOrder.VendorOrderID,
|
// VendorOrderID: afsOrder.VendorOrderID,
|
||||||
VendorStoreID: afsOrder.VendorStoreID,
|
// VendorStoreID: afsOrder.VendorStoreID,
|
||||||
StoreID: afsOrder.StoreID,
|
// StoreID: afsOrder.StoreID,
|
||||||
Count: sku.Number,
|
// IsAfsOrder: 1,
|
||||||
|
|
||||||
|
Count: sku.Number,
|
||||||
// ConfirmTime: afsOrder.AfsCreateAt,
|
// ConfirmTime: afsOrder.AfsCreateAt,
|
||||||
VendorSkuID: sku.SkuID,
|
VendorSkuID: sku.SkuID,
|
||||||
SkuID: int(utils.Str2Int64WithDefault(sku.CustomSkuID, 0)),
|
SkuID: int(utils.Str2Int64WithDefault(sku.CustomSkuID, 0)),
|
||||||
Name: sku.Name,
|
Name: sku.Name,
|
||||||
UserMoney: sku.TotalRefund,
|
UserMoney: sku.TotalRefund,
|
||||||
PmSkuSubsidyMoney: sku.ShopEleRefund,
|
PmSkuSubsidyMoney: sku.ShopEleRefund,
|
||||||
IsAfsOrder: 1,
|
|
||||||
}
|
}
|
||||||
afsOrder.SkuUserMoney += orderSku.UserMoney
|
afsOrder.SkuUserMoney += orderSku.UserMoney
|
||||||
afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney
|
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 {
|
if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDEBAI); err2 == nil {
|
||||||
afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg)
|
afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg)
|
||||||
cancelData := msg.Data.(*ebaiapi.CBUserCancelInfo)
|
cancelData := msg.Data.(*ebaiapi.CBUserCancelInfo)
|
||||||
|
afsOrder.AfsOrderID = orderStatus.VendorOrderID
|
||||||
afsOrder.RefundType = model.AfsTypeFullRefund
|
afsOrder.RefundType = model.AfsTypeFullRefund
|
||||||
afsOrder.AppealType = model.AfsAppealTypeRefund
|
afsOrder.AppealType = model.AfsAppealTypeRefund
|
||||||
afsOrder.VendorReasonType = ""
|
afsOrder.VendorReasonType = ""
|
||||||
|
|||||||
@@ -144,20 +144,20 @@ func (c *PurchaseHandler) buildAfsOrder(afsInfo *jdapi.AfsServiceResponse) (afsO
|
|||||||
|
|
||||||
for _, x := range afsInfo.AfsDetailList {
|
for _, x := range afsInfo.AfsDetailList {
|
||||||
orderSku := &model.OrderSkuFinancial{
|
orderSku := &model.OrderSkuFinancial{
|
||||||
VendorID: model.VendorIDJD,
|
// VendorID: model.VendorIDJD,
|
||||||
AfsOrderID: afsOrder.AfsOrderID,
|
// AfsOrderID: afsOrder.AfsOrderID,
|
||||||
VendorOrderID: afsOrder.VendorOrderID,
|
// VendorOrderID: afsOrder.VendorOrderID,
|
||||||
VendorStoreID: afsOrder.VendorStoreID,
|
// VendorStoreID: afsOrder.VendorStoreID,
|
||||||
StoreID: afsOrder.StoreID,
|
// StoreID: afsOrder.StoreID,
|
||||||
Count: x.SkuCount,
|
// IsAfsOrder: 1,
|
||||||
|
|
||||||
|
Count: x.SkuCount,
|
||||||
// ConfirmTime: afsOrder.AfsCreateAt,
|
// ConfirmTime: afsOrder.AfsCreateAt,
|
||||||
VendorSkuID: utils.Int64ToStr(x.WareID),
|
VendorSkuID: utils.Int64ToStr(x.WareID),
|
||||||
SkuID: int(utils.Str2Int64WithDefault(x.SkuIDIsv, 0)),
|
SkuID: int(utils.Str2Int64WithDefault(x.SkuIDIsv, 0)),
|
||||||
Name: x.WareName,
|
Name: x.WareName,
|
||||||
UserMoney: x.AfsMoney,
|
UserMoney: x.AfsMoney,
|
||||||
PmSkuSubsidyMoney: x.PlatPayMoney,
|
PmSkuSubsidyMoney: x.PlatPayMoney,
|
||||||
IsAfsOrder: 1,
|
|
||||||
}
|
}
|
||||||
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
||||||
orderSku.PmSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
orderSku.PmSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
||||||
|
|||||||
@@ -78,20 +78,19 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
|
|||||||
}
|
}
|
||||||
for _, sku := range refundData.FoodList {
|
for _, sku := range refundData.FoodList {
|
||||||
orderSku := &model.OrderSkuFinancial{
|
orderSku := &model.OrderSkuFinancial{
|
||||||
VendorID: model.VendorIDMTWM,
|
// VendorID: model.VendorIDMTWM,
|
||||||
AfsOrderID: afsOrder.AfsOrderID,
|
// AfsOrderID: afsOrder.AfsOrderID,
|
||||||
VendorOrderID: afsOrder.VendorOrderID,
|
// VendorOrderID: afsOrder.VendorOrderID,
|
||||||
VendorStoreID: afsOrder.VendorStoreID,
|
// VendorStoreID: afsOrder.VendorStoreID,
|
||||||
StoreID: afsOrder.StoreID,
|
// StoreID: afsOrder.StoreID,
|
||||||
Count: sku.Count,
|
// IsAfsOrder: 1,
|
||||||
|
|
||||||
|
Count: sku.Count,
|
||||||
// ConfirmTime: afsOrder.AfsCreateAt,
|
// ConfirmTime: afsOrder.AfsCreateAt,
|
||||||
VendorSkuID: sku.SkuID,
|
VendorSkuID: sku.SkuID,
|
||||||
SkuID: int(utils.Str2Int64WithDefault(sku.SkuID, 0)),
|
SkuID: int(utils.Str2Int64WithDefault(sku.SkuID, 0)),
|
||||||
Name: sku.FoodName,
|
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.SkuUserMoney += orderSku.UserMoney
|
||||||
afsOrder.Skus = append(afsOrder.Skus, orderSku)
|
afsOrder.Skus = append(afsOrder.Skus, orderSku)
|
||||||
@@ -100,7 +99,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
|
|||||||
} else {
|
} else {
|
||||||
if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDMTWM); err2 == nil {
|
if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(orderStatus.RefVendorOrderID, model.VendorIDMTWM); err2 == nil {
|
||||||
afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg.FormData)
|
afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg.FormData)
|
||||||
afsOrder.AfsOrderID = ""
|
afsOrder.AfsOrderID = orderStatus.VendorOrderID
|
||||||
afsOrder.RefundType = model.AfsTypeFullRefund
|
afsOrder.RefundType = model.AfsTypeFullRefund
|
||||||
afsOrder.AppealType = model.AfsAppealTypeRefund
|
afsOrder.AppealType = model.AfsAppealTypeRefund
|
||||||
afsOrder.VendorReasonType = ""
|
afsOrder.VendorReasonType = ""
|
||||||
|
|||||||
Reference in New Issue
Block a user