1
This commit is contained in:
@@ -120,16 +120,8 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
|
||||
taskID := batchItemList[0].(int)
|
||||
if taskID == 1 {
|
||||
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 {
|
||||
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
|
||||
}, taskIDs)
|
||||
@@ -137,9 +129,6 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
|
||||
task.GetResult(0)
|
||||
if err1 == nil {
|
||||
order = p.Map2Order(result1)
|
||||
if vendorOrderID == "4062150144186637882" {
|
||||
globals.SugarLogger.Debugf("=====order----- %s", utils.Format4Output(order, false))
|
||||
}
|
||||
if err2 == nil {
|
||||
order.Skus = p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"])
|
||||
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) {
|
||||
refundDetail := orderDetail2.([]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 {
|
||||
product := product2.(map[string]interface{})
|
||||
if orderID == "4062150144186637882" {
|
||||
globals.SugarLogger.Debugf("=====product %s", utils.Format4Output(product, false))
|
||||
}
|
||||
if product["virtual_type"] == ebaiapi.OrderVirtualType {
|
||||
skuName := product["sku_name"].(string)
|
||||
_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName)
|
||||
@@ -200,7 +182,7 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet
|
||||
VendorID: model.VendorIDEBAI,
|
||||
Count: number,
|
||||
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,
|
||||
Weight: int(utils.Interface2Int64WithDefault(product["refund_weight"], 0)) / number, // 退单这里的total_weight有BUG,这里的total_weight还是没有退单时的值
|
||||
VendorPrice: utils.MustInterface2Int64(product["refund_user_amount"]),
|
||||
@@ -213,9 +195,6 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet
|
||||
skuList = append(skuList, sku)
|
||||
}
|
||||
}
|
||||
if orderID == "4062150144186637882" {
|
||||
globals.SugarLogger.Debugf("=====skuList %s", utils.Format4Output(skuList, false))
|
||||
}
|
||||
return skuList
|
||||
}
|
||||
|
||||
@@ -563,11 +542,6 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.
|
||||
if status.Status == model.OrderStatusAdjust {
|
||||
var order *model.GoodsOrder
|
||||
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 {
|
||||
err = partner.CurOrderManager.OnOrderAdjust(order, status)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user