From 8041a4a4fc4071e9e6ea6e49c1ed4396615139d7 Mon Sep 17 00:00:00 2001
From: fengtianyangyang <5411465+feng_tianyangyang@user.noreply.gitee.com>
Date: Fri, 15 Jul 2022 14:27:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=80=80=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/order/serviceimpl/StoreFlowServiceImpl.java     | 8 ++++----
 .../lili/modules/store/serviceimpl/BillServiceImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
index a9ec6265..2616b74c 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
@@ -118,10 +118,10 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
         storeFlow.setCommissionPrice(CurrencyUtil.mul(CurrencyUtil.div(payStoreFlow.getCommissionPrice(), payStoreFlow.getNum()), afterSale.getNum()));
         //分销佣金 =（分销佣金/订单商品数量）* 售后商品数量
         storeFlow.setDistributionRebate(CurrencyUtil.mul(CurrencyUtil.div(payStoreFlow.getDistributionRebate(), payStoreFlow.getNum()), afterSale.getNum()));
-        //流水金额 = 实际退款金额
-        storeFlow.setFinalPrice(afterSale.getActualRefundPrice());
-        //最终结算金额 =店铺流水金额+店铺单品返现支出金额+平台收取佣金金额
-        storeFlow.setBillPrice(CurrencyUtil.add(storeFlow.getFinalPrice(), storeFlow.getDistributionRebate(), storeFlow.getCommissionPrice()));
+        //流水金额 = 支付最终结算金额
+        storeFlow.setFinalPrice(payStoreFlow.getBillPrice());
+        //最终结算金额 =实际退款金额
+        storeFlow.setBillPrice(afterSale.getActualRefundPrice());
         //站点优惠券补贴返还金额=(站点优惠券补贴金额/购买商品数量)*退款商品数量
         storeFlow.setSiteCouponCommission(CurrencyUtil.mul(CurrencyUtil.div(payStoreFlow.getSiteCouponCommission(), payStoreFlow.getNum()), afterSale.getNum()));
         //平台优惠券 使用金额
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
index 1724655c..8d081926 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
@@ -98,7 +98,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
             //退单产生退还佣金金额
             bill.setRefundCommissionPrice(refundBill.getRefundCommissionPrice() != null ? refundBill.getRefundCommissionPrice() : 0D);
             //分销订单退还，返现佣金返还
-            bill.setDistributionRefundCommission(refundBill.getDistributionRefundCommission() != null ? refundBill.getRefundCommissionPrice() : 0D);
+            bill.setDistributionRefundCommission(refundBill.getDistributionRefundCommission() != null ? refundBill.getDistributionRefundCommission() : 0D);
             //退货平台优惠券补贴返还
             bill.setSiteCouponRefundCommission(refundBill.getSiteCouponRefundCommission() != null ? refundBill.getSiteCouponRefundCommission() : 0D);
             //退款金额=店铺最终退款结算金额