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-03-27 11:40:17 +08:00
parent 24a9240d7e
commit e387988cd9
4 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxcallback/orderman/order_afs.go
View File

@@ -146,11 +146,7 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD
deductionsByPm := afsOrder.PmSubsidyMoney + afsOrder.AfsFreightMoney + afsOrder.BoxMoney + afsOrder.TongchengFreightMoney deductionsByPm := afsOrder.PmSubsidyMoney + afsOrder.AfsFreightMoney + afsOrder.BoxMoney + afsOrder.TongchengFreightMoney
afsOrder.RefundMoneyByCal = afsOrder.SkuUserMoney + afsOrder.FreightUserMoney + deductionsByPm - afsOrder.PmRefundMoney afsOrder.RefundMoneyByCal = afsOrder.SkuUserMoney + afsOrder.FreightUserMoney + deductionsByPm - afsOrder.PmRefundMoney
// order.TotalMoney += order.SkuJxMoney // 退款单京西补贴部分先不作计算 // order.TotalMoney += order.SkuJxMoney // 退款单京西补贴部分先不作计算
if afsOrder.VendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====afsOrder2 %s", utils.Format4Output(afsOrder, false))
}
if err = dao.CreateEntity(db, afsOrder); err != nil { if err = dao.CreateEntity(db, afsOrder); err != nil {
globals.SugarLogger.Debugf("=====err300 %v", err)
return err return err
} }
@@ -159,22 +155,14 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD
orderSku.RefundMoneyByCal = orderSku.PmSkuSubsidyMoney + orderSku.RefundMoneyByCal = orderSku.PmSkuSubsidyMoney +
utils.Float64TwoInt64(float64(afsOrder.RefundMoneyByCal-afsOrder.PmSkuSubsidyMoney)*float64(orderSku.UserMoney+orderSku.PmSubsidyMoney-orderSku.PmSkuSubsidyMoney)/float64(afsOrder.SkuUserMoney+afsOrder.PmSubsidyMoney-afsOrder.PmSkuSubsidyMoney)) utils.Float64TwoInt64(float64(afsOrder.RefundMoneyByCal-afsOrder.PmSkuSubsidyMoney)*float64(orderSku.UserMoney+orderSku.PmSubsidyMoney-orderSku.PmSkuSubsidyMoney)/float64(afsOrder.SkuUserMoney+afsOrder.PmSubsidyMoney-afsOrder.PmSkuSubsidyMoney))
afsOrder.Skus[0].RefundMoneyByCal += orderSku.RefundMoneyByCal afsOrder.Skus[0].RefundMoneyByCal += orderSku.RefundMoneyByCal
if afsOrder.VendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====orderSku %s", utils.Format4Output(orderSku, false))
}
if err = dao.CreateEntity(db, orderSku); err != nil { if err = dao.CreateEntity(db, orderSku); err != nil {
globals.SugarLogger.Debugf("=====err300 %v", err)
return err return err
} }
} }
if len(afsOrder.Skus) > 0 { if len(afsOrder.Skus) > 0 {
orderSku := afsOrder.Skus[0] orderSku := afsOrder.Skus[0]
orderSku.RefundMoneyByCal = afsOrder.RefundMoneyByCal - orderSku.RefundMoneyByCal orderSku.RefundMoneyByCal = afsOrder.RefundMoneyByCal - orderSku.RefundMoneyByCal
if afsOrder.VendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====orderSku %s", utils.Format4Output(orderSku, false))
}
if err = dao.CreateEntity(db, orderSku); err != nil { if err = dao.CreateEntity(db, orderSku); err != nil {
globals.SugarLogger.Debugf("=====orderSku err300 %v", err)
return err return err
} }
} else { } else {

2
business/partner/purchase/ebai/financial.go
View File

@@ -149,7 +149,7 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData map[string]interfac
VendorOrderID: afsOrder.VendorOrderID, VendorOrderID: afsOrder.VendorOrderID,
VendorSubOrderID: afsOrder.VendorOrderID2, VendorSubOrderID: afsOrder.VendorOrderID2,
// ConfirmTime: getTimeFromInterface(xMap["apply_time"]), // ConfirmTime: getTimeFromInterface(xMap["apply_time"]),
VendorSkuID: utils.Int64ToStr(utils.MustInterface2Int64(xMap["platform_sku_id"])), VendorSkuID: utils.Int2Str(xMap["platform_sku_id"].(int)),
SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(xMap["custom_sku_id"]), 0)), SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(xMap["custom_sku_id"]), 0)),
Name: utils.Interface2String(xMap["sku_name"]), Name: utils.Interface2String(xMap["sku_name"]),
UserMoney: utils.MustInterface2Int64(xMap["refund_user_amount"]), UserMoney: utils.MustInterface2Int64(xMap["refund_user_amount"]),

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

@@ -120,16 +120,8 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
taskID := batchItemList[0].(int) taskID := batchItemList[0].(int)
if taskID == 1 { if taskID == 1 {
result1, err1 = api.EbaiAPI.OrderGet(vendorOrderID) result1, err1 = api.EbaiAPI.OrderGet(vendorOrderID)
if vendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====result1 %s", utils.Format4Output(result1, false))
globals.SugarLogger.Debugf("=====err1 %v", err)
}
} else if taskID == 2 { } else if taskID == 2 {
result2, err2 = api.EbaiAPI.OrderPartRefundGet(vendorOrderID) result2, err2 = api.EbaiAPI.OrderPartRefundGet(vendorOrderID)
if vendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====result2 %s", utils.Format4Output(result2, false))
globals.SugarLogger.Debugf("=====err2 %v", err)
}
} }
return nil, nil return nil, nil
}, taskIDs) }, taskIDs)
@@ -137,9 +129,6 @@ 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)
if vendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====order----- %s", utils.Format4Output(order, false))
}
if err2 == nil { if err2 == nil {
order.Skus = p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"]) order.Skus = p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"])
giftSkus, discountMoney := getZengSkus(vendorOrderID, result1) giftSkus, discountMoney := getZengSkus(vendorOrderID, result1)
@@ -182,15 +171,8 @@ func getZengSkus(orderID string, orderMan map[string]interface{}) (skus []*model
func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDetail2 interface{}) (skuList []*model.OrderSku) { func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDetail2 interface{}) (skuList []*model.OrderSku) {
refundDetail := orderDetail2.([]interface{}) refundDetail := orderDetail2.([]interface{})
refundSkuList := refundDetail[len(refundDetail)-1].(map[string]interface{})["sub_reverse_order_list"].([]interface{}) refundSkuList := refundDetail[len(refundDetail)-1].(map[string]interface{})["sub_reverse_order_list"].([]interface{})
if orderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====refundDetail %s", utils.Format4Output(refundDetail, false))
globals.SugarLogger.Debugf("=====refundSkuList %s", utils.Format4Output(refundSkuList, false))
}
for _, product2 := range refundSkuList { for _, product2 := range refundSkuList {
product := product2.(map[string]interface{}) product := product2.(map[string]interface{})
if orderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====product %s", utils.Format4Output(product, false))
}
if product["virtual_type"] == ebaiapi.OrderVirtualType { if product["virtual_type"] == ebaiapi.OrderVirtualType {
skuName := product["sku_name"].(string) skuName := product["sku_name"].(string)
_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName) _, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName)
@@ -200,7 +182,7 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet
VendorID: model.VendorIDEBAI, VendorID: model.VendorIDEBAI,
Count: number, Count: number,
SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(product[ebaiapi.KeyCustomSkuID]), 0)), SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(product[ebaiapi.KeyCustomSkuID]), 0)),
VendorSkuID: utils.Interface2String(product["platform_sku_id"]), VendorSkuID: utils.Int2Str(product["platform_sku_id"].(int)),
SkuName: skuName, SkuName: skuName,
Weight: int(utils.Interface2Int64WithDefault(product["refund_weight"], 0)) / number, // 退单这里的total_weight有BUG，这里的total_weight还是没有退单时的值 Weight: int(utils.Interface2Int64WithDefault(product["refund_weight"], 0)) / number, // 退单这里的total_weight有BUG，这里的total_weight还是没有退单时的值
VendorPrice: utils.MustInterface2Int64(product["refund_user_amount"]), VendorPrice: utils.MustInterface2Int64(product["refund_user_amount"]),
@@ -213,9 +195,6 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet
skuList = append(skuList, sku) skuList = append(skuList, sku)
} }
} }
if orderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====skuList %s", utils.Format4Output(skuList, false))
}
return skuList return skuList
} }
@@ -563,11 +542,6 @@ 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))
if status.RefVendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====orderStatus %s", utils.Format4Output(status, false))
globals.SugarLogger.Debugf("=====order %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=====err %v", err)
}
if err == nil { if err == nil {
err = partner.CurOrderManager.OnOrderAdjust(order, status) err = partner.CurOrderManager.OnOrderAdjust(order, status)
} }

13
business/partner/purchase/ebai/order_afs.go
View File

@@ -61,9 +61,6 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) { func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) {
if orderStatus := c.callbackAfsMsg2Status(msg); orderStatus != nil { if orderStatus := c.callbackAfsMsg2Status(msg); orderStatus != nil {
var err error var err error
if orderStatus.RefVendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====orderStatus %s", utils.Format4Output(orderStatus, false))
}
if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew { if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew {
var afsOrder *model.AfsOrder var afsOrder *model.AfsOrder
if msg.Cmd == ebaiapi.CmdOrderPartRefund { if msg.Cmd == ebaiapi.CmdOrderPartRefund {
@@ -130,10 +127,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
} }
} else { } else {
afsOrder2, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID) afsOrder2, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID)
if orderStatus.RefVendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====afsOrder2 %s", utils.Format4Output(afsOrder2, false))
globals.SugarLogger.Debugf("=====err %v", err)
}
if afsOrder2 == nil && err == nil { if afsOrder2 == nil && err == nil {
partRefundData := msg.Data.(*ebaiapi.CBPartRefundInfo) partRefundData := msg.Data.(*ebaiapi.CBPartRefundInfo)
afsOrder := &model.AfsOrder{ afsOrder := &model.AfsOrder{
@@ -165,14 +158,8 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney
afsOrder.Skus = append(afsOrder.Skus, orderSku) afsOrder.Skus = append(afsOrder.Skus, orderSku)
} }
if orderStatus.RefVendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====afsOrder %s", utils.Format4Output(afsOrder, false))
}
if afsOrder != nil { if afsOrder != nil {
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
if orderStatus.RefVendorOrderID == "4062150144186637882" {
globals.SugarLogger.Debugf("=====err2 %v", err)
}
} }
} else { } else {
err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus) err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus)