diff --git a/business/jxcallback/orderman/financial.go b/business/jxcallback/orderman/financial.go index e3718efc1..1647af77a 100644 --- a/business/jxcallback/orderman/financial.go +++ b/business/jxcallback/orderman/financial.go @@ -62,8 +62,8 @@ func (c *OrderManager) SaveOrderFinancialInfo(order *model.OrderFinancial, opera } } order.ShopMoneyByCal = order.SalePriceMoney - order.TotalDiscountMoney - order.PointsDeductionMoney + order.PmFreightDiscountMoney - order.DistanceFreightMoney - order.FreightTipsMoney - order.DonationMoney + order.SelfDeliveryDiscountMoney + order.PmSubsidyMoney + order.SkuBoxMoney + order.BoxMoney - order.PmMoney - order.JxPmMoney = (order.ShopMoney+order.PmMoney)*TotalRate/1000 - order.PmMoney // 京西平台费 = 总金额*20%-第三方平台费 - if order.JxPmMoney < 0 { // 如果算出京西平台费为负数,则置0 + order.JxPmMoney = utils.Float64TwoInt64(float64(order.ShopMoney+order.PmMoney)*TotalRate/1000) - order.PmMoney // 京西平台费 = 总金额*20%-第三方平台费 + if order.JxPmMoney < 0 { // 如果算出京西平台费为负数,则置0 order.JxPmMoney = 0 } diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go index ebb444b0a..a3b375964 100644 --- a/business/partner/purchase/ebai/financial.go +++ b/business/partner/purchase/ebai/financial.go @@ -117,7 +117,7 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData map[string]interfac err = nil } // 部分退款订单,第三方平台佣金会变化,金额为 orderData["commission"],是否将该字段更新到正向订单结算表中 - // 不作更新的话,商户可以得到的钱会少几毛钱,最终京西收益 + // 不作更新的话,商户可以得到的钱会少几毛钱,最终京西受益 // 如果要更新,总佣金,京西佣金是否都要更新,而其它一系列连锁反应,是否需要考虑更新 // 或者换个思路,不考虑变更之前的正向订单,在佣金上入手,退款金额减去佣金减少的部分 orderFinancial, err := partner.CurOrderManager.LoadOrderFinancial(afsOrder.VendorOrderID, model.VendorIDEBAI)