From 9f01fe60f3e16c9e71a408b6f4d97fdf57b73595 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 20 Aug 2024 10:31:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=80=BB=E8=BE=91=E5=92=8C=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/OrderController.php | 2 +-
 app/common/logic/StoreFinanceFlowLogic.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index 5f9ed4ed5..15211d3d2 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -487,7 +487,7 @@ class OrderController extends BaseApiController
         $uid = $this->userId;
         //拆单逻辑
         $res = OrderLogic::dealRefund($uid, $params);
-        $detail = StoreOrder::where('id', $params['id'])->where('refund_type', 1)->find();
+        $detail = StoreOrder::where('id', $params['id'])->where('refund_status', 1)->find();
         if ($detail && $res != 2) {
             $res = StoreOrderLogic::refund($detail, ['order_id' => $detail['order_id']]);
             if ($res != false) {
diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php
index 854ba05ac..9320689ae 100644
--- a/app/common/logic/StoreFinanceFlowLogic.php
+++ b/app/common/logic/StoreFinanceFlowLogic.php
@@ -155,14 +155,14 @@ class StoreFinanceFlowLogic extends BaseLogic
             SystemStore::where('id', $store_id)->inc('store_money', $money)->update();
         }
         if ($deposit > 0) {
-            $capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $money);
+            $capitalFlowDao->storeIncome('store_paid_deposit_add', 'order', $order_id, $deposit);
             SystemStore::where('id', $store_id)->inc('paid_deposit', $deposit)->update();
         }
         $find = StoreFinanceFlow::where(['order_id' => $order_id, 'financial_pm' => 1, 'financial_type' => 16, 'status' => 0])->find();
         StoreFinanceFlow::where(['order_id' => $order_id, 'financial_type' => 16])->update(['status' => 1]);
         if ($find) {
             if ($find['number'] > 0) {
-                $capitalFlowDao->storeIncome('store_attrition_add', 'order', $order_id, $money);
+                $capitalFlowDao->storeIncome('store_attrition_add', 'order', $order_id, $find['number']);
                 SystemStore::where('id', $store_id)->inc('attrition', $find['number'])->update();
             }
         }