From cd9eb33f8f01c4d76aff0c315b03783ea212c42d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 22 May 2024 17:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplier/SupplierController.php           | 20 ++++++++++++++++++-
 .../lists/financial/FinancialRecordLists.php  |  9 +++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/admin/controller/supplier/SupplierController.php b/app/admin/controller/supplier/SupplierController.php
index a060d49..2f034d6 100644
--- a/app/admin/controller/supplier/SupplierController.php
+++ b/app/admin/controller/supplier/SupplierController.php
@@ -122,7 +122,25 @@ class SupplierController extends BaseAdminController
         return $this->success('删除成功', [], 1, 1);
     }
 
-
+    /**
+     * @notes 绑定用户
+     */
+    public function bind_user()
+    {
+        $params = $this->request->post();
+        if (!isset($params['id']) && !isset($params['uid'])) {
+            return $this->fail('参数错误');
+        }
+        $find = Supplier::where('uid', $params['uid'])->find();
+        if ($find) {
+            return $this->fail('该用户已绑定商户');
+        }
+        $res = Supplier::where('id', $params['id'])->update(['uid' => $params['uid']]);
+        if ($res) {
+            return $this->success('绑定成功', [], 1, 1);
+        }
+        return $this->fail('绑定失败');
+    }
     /**
      * @notes 获取供应商管理详情
      * @return \think\response\Json
diff --git a/app/api/lists/financial/FinancialRecordLists.php b/app/api/lists/financial/FinancialRecordLists.php
index a79def4..668f1da 100644
--- a/app/api/lists/financial/FinancialRecordLists.php
+++ b/app/api/lists/financial/FinancialRecordLists.php
@@ -4,6 +4,7 @@ namespace app\api\lists\financial;
 
 
 use app\admin\lists\BaseAdminDataLists;
+use app\common\enum\OrderEnum;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\financial\FinancialRecord;
 
@@ -51,13 +52,17 @@ class FinancialRecordLists extends BaseAdminDataLists implements ListsSearchInte
             'mer_id' => $mer_id,
         ];
         $this->where = $where;
+        $searchWhere=$this->searchWhere;
         $list = FinancialRecord::where($this->searchWhere)
             ->where($where)
             ->field("FROM_UNIXTIME(create_time, '%Y-%m-%d') as record_date, SUM(number) as total_amount")
             ->group('record_date')
             ->order('record_date')
-            ->select()->each(function ($item) {
-                $item['total_amount'] = $item['total_amount'] ?? 0;
+            ->select()->each(function ($item) use($where,$searchWhere) {
+                $cashier_total_amount=FinancialRecord::where($where)->where($searchWhere)->where('financial_type',OrderEnum::CASHIER_ORDER_PAY)->sum('number');
+                $item['cashier_total_amount'] = $cashier_total_amount;
+                $cashier_cash_total_amount=FinancialRecord::where($where)->where($searchWhere)->where('financial_type',OrderEnum::CASHIER_CASH_ORDER_PAY)->sum('number');
+                $item['cashier_cash_total_amount'] = $cashier_cash_total_amount;
             });
         return $list?->toArray();
     }