From da8e4de9fa3959c694ce66ddd70336a8fb857a2d Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 27 May 2023 13:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=B9=B3=E5=8F=B0=E6=89=8B?=
 =?UTF-8?q?=E7=BB=AD=E8=B4=B9=E5=88=86=E6=B6=A6=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreRefundOrderRepository.php           | 6 ++++++
 app/listener/AfterRefund.php                             | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/common/repositories/store/order/StoreRefundOrderRepository.php b/app/common/repositories/store/order/StoreRefundOrderRepository.php
index 5d014f67..b47ba88b 100644
--- a/app/common/repositories/store/order/StoreRefundOrderRepository.php
+++ b/app/common/repositories/store/order/StoreRefundOrderRepository.php
@@ -17,6 +17,7 @@ namespace app\common\repositories\store\order;
 use app\common\dao\store\order\StoreRefundOrderDao;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreRefundOrder;
+use app\common\model\system\merchant\FinancialRecord;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\system\merchant\FinancialRecordRepository;
@@ -1136,6 +1137,11 @@ class StoreRefundOrderRepository extends BaseRepository
         if ($refundOrder->order->commission_rate > 0) {
             $_refundRate = bcmul($commission_rate, bcsub($refundPrice, $extension, 2), 2);
         }
+        $autoMargin = FinancialRecord::getInstance()
+            ->where(['order_id' => $refundOrder->order->order_id, 'mer_id' => $refundOrder['mer_id'], 'financial_type' => 'auto_margin'])
+            ->sum('number');
+        $refundPrice = bcsub($refundPrice, $autoMargin, 2);
+
         return bcsub(bcsub($refundPrice, $extension, 2), $_refundRate, 2);
     }
 
diff --git a/app/listener/AfterRefund.php b/app/listener/AfterRefund.php
index 2e1dcf7e..f8da1957 100644
--- a/app/listener/AfterRefund.php
+++ b/app/listener/AfterRefund.php
@@ -46,7 +46,6 @@ class AfterRefund
                     $merchant->is_margin = MerchantRepository::NeedMargin;
                 }
                 $merchant->save();
-                $this->addMoney($financialRecord);
                 $this->saveFinanceRecord($financialRecord);
             }
         }
@@ -61,14 +60,6 @@ class AfterRefund
         $merchantRepository->subLockMoney($financialRecord['mer_id'], 'order', $this->refundOrder['order_id'], (float)$financialRecord['number']);
     }
 
-    public function addMoney($financialRecord)
-    {
-        Log::info("refundCommission, mer_id: {$financialRecord['mer_id']}, money: {$financialRecord['number']}");
-        /** @var MerchantRepository $merchantRepository */
-        $merchantRepository = app()->make(MerchantRepository::class);
-        $merchantRepository->addMoney($financialRecord['mer_id'], (float)$financialRecord['number']);
-    }
-
     public function saveFinanceRecord($financialRecord)
     {
         /** @var FinancialRecordRepository $financialRecordRepository */