diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 17752bc26..6d2c4ed92 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -159,13 +159,13 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord order.TotalShopMoney = orderSettlement.SettlementAmount order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney if order.TotalShopMoney > 0 { - // order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID) - // storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order2), order.VendorID) - // if storeDetail != nil { - // jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage) - // } else { - // globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount) - // } + order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID) + storeDetail, _ := partner.CurOrderManager.LoadStoreDetail(jxutils.GetSaleStoreIDFromOrder(order2), order.VendorID) + if storeDetail != nil && order2 != nil { + jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage) + } else { + globals.SugarLogger.Warnf("updateOrderBySettleMent,%v,%v,%v", order.VendorOrderID, orderSettlement.SettlementAmount) + } } else { order.NewEarningPrice = order.EarningPrice }