From e543fc4f52e65f92128f3a93b946c2bd99ca9311 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 4 Jun 2024 09:24:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(financial=5Frecord):=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B4=A2=E5=8A=A1=E6=B5=81=E6=B0=B4=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=8A=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StoreFinanceFlowLists.php                 |  3 +--
 app/common/logic/PayNotifyLogic.php           | 14 +++---------
 .../financial_record/FinancialRecord.php      | 22 -------------------
 3 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 app/common/model/financial_record/FinancialRecord.php

diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
index 7dfa79216..f41563b43 100644
--- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
+++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
@@ -8,7 +8,6 @@ use app\common\enum\OrderEnum;
 use app\common\enum\PayEnum;
 use app\common\model\store_finance_flow\StoreFinanceFlow;
 use app\common\lists\ListsSearchInterface;
-use app\common\model\financial_record\FinancialRecord;
 use app\common\model\system_store\SystemStoreStaff;
 use app\common\model\user\User;
 
@@ -46,7 +45,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
      */
     public function lists(): array
     {
-        return FinancialRecord::where($this->searchWhere)
+        return StoreFinanceFlow::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) {
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index d2f9a71f9..66da67568 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -4,17 +4,9 @@ namespace app\common\logic;
 
 use app\common\enum\OrderEnum;
 use app\common\enum\PayEnum;
-use app\common\enum\user\AccountLogEnum;
-use app\common\model\operation\Opurchaseclass;
-use app\common\model\order\Cart;
-use app\common\model\financial_record\FinancialRecord;
-use app\common\model\recharge\RechargeOrder;
-use app\common\model\retail\Cashierclass;
 use app\common\model\store_finance_flow\StoreFinanceFlow;
 use app\common\model\store_order\StoreOrder;
-use app\common\model\user\User;
 use app\common\service\PushService;
-use app\common\service\wechat\WeChatMnpService;
 use support\Log;
 use think\facade\Db;
 use Webman\RedisQueue\Redis;
@@ -107,7 +99,7 @@ class PayNotifyLogic extends BaseLogic
             'store_id' => $order['store_id'],
             'staff_id' => $order['staff_id'],
         ];
-        (new FinancialRecord())->saveAll($record);
+        (new StoreFinanceFlow())->saveAll($record);
 
 
         if ($order->pay_type == 9) {
@@ -151,7 +143,7 @@ class PayNotifyLogic extends BaseLogic
             'store_id' => $order['store_id'],
             'staff_id' => $order['staff_id'],
         ];
-        (new FinancialRecord())->saveAll($record);
+        (new StoreFinanceFlow())->saveAll($record);
     }
 
     /**
@@ -211,7 +203,7 @@ class PayNotifyLogic extends BaseLogic
             'type' => OrderEnum::MERCHANT,
             'mer_id' => $order['merchant'],
         ];
-        (new FinancialRecord())->saveAll($record);
+        (new StoreFinanceFlow())->saveAll($record);
 
 
         if ($order->pay_type == 9) {
diff --git a/app/common/model/financial_record/FinancialRecord.php b/app/common/model/financial_record/FinancialRecord.php
deleted file mode 100644
index d6bb48eda..000000000
--- a/app/common/model/financial_record/FinancialRecord.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace app\common\model\financial_record;
-
-
-use app\common\model\BaseModel;
-use think\model\concern\SoftDelete;
-
-
-/**
- * 财务流水模型
- * Class FinancialRecord
- * @package app\common\model\financial_record
- */
-class FinancialRecord extends BaseModel
-{
-    use SoftDelete;
-    protected $name = 'financial_record';
-    protected $deleteTime = 'delete_time';
-
-    
-}
\ No newline at end of file

From 69c2d5a42e70121d5a9af1986957e133df1a872d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 4 Jun 2024 10:18:31 +0800
Subject: [PATCH 2/3] 1

---
 app/api/controller/IndexController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 408d88742..53d400219 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -15,7 +15,7 @@ class IndexController extends BaseApiController
     public function index()
     {
         
-        
+        d(2);
 
         $params=['store_id'=>2,'pay_type'=>17];
         $a=StoreOrderLogic::createOrder([1],0,null,$params);

From 35c46240d455f2385168193d4de84e14118a4645 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 4 Jun 2024 10:19:09 +0800
Subject: [PATCH 3/3] 1

---
 app/api/controller/IndexController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 53d400219..1a607e517 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -10,7 +10,7 @@ use Webman\Config;
 
 class IndexController extends BaseApiController
 {
-    public $notNeedLogin = ['app_update','express_list','province','city','area','street'];
+    public $notNeedLogin = ['index','app_update','express_list','province','city','area','street'];
 
     public function index()
     {