From d424a7b8a58e8e6025ce4204ee91cedae4f6b551 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Mon, 12 Aug 2024 14:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E8=AE=A1=E7=AE=97=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/shop/LocalStore.php | 2 +-
 app/admin/logic/shop/LocalStoreLogic.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/admin/controller/shop/LocalStore.php b/app/admin/controller/shop/LocalStore.php
index b1184429..1b40b0c4 100755
--- a/app/admin/controller/shop/LocalStore.php
+++ b/app/admin/controller/shop/LocalStore.php
@@ -97,7 +97,7 @@ class LocalStore extends AdminBase
     {
         $result = LocalStoreLogic::exportOrderData();
         if(false === $result) {
-            return JsonServer::error(InvoiceLogic::getError() ?: '导出失败');
+            return JsonServer::error(LocalStoreLogic::getError() ?: '导出失败');
         }
         return JsonServer::success('', $result);
     }
diff --git a/app/admin/logic/shop/LocalStoreLogic.php b/app/admin/logic/shop/LocalStoreLogic.php
index 506d871f..81eb1041 100755
--- a/app/admin/logic/shop/LocalStoreLogic.php
+++ b/app/admin/logic/shop/LocalStoreLogic.php
@@ -15,7 +15,8 @@ class LocalStoreLogic extends Logic
 {
     public static $STATE_ENUM = [1, 2];
     private static $PAYMENT_TYPE = array(
-        1 => '对公银行账户'
+        1 => '对公银行账户',
+        2 => '私有账户'
     );
 
     public static function lists()
@@ -62,6 +63,8 @@ class LocalStoreLogic extends Logic
     {
         try {
             $lists = LocalStoreOrder::order('id desc')
+                ->field('payment_type, account_name, bank_name, bank_card, large_number, separate_account, sum(separate_account) as total, tips, notes')
+                ->group('bank_card')
                 ->select()
                 ->toArray();
 
@@ -79,7 +82,8 @@ class LocalStoreLogic extends Logic
                 'large_number' => '大额行号',
                 'separate_account' => '分账金额',
                 'tips' => '交易附言',
-                'notes' => '备注'
+                'notes' => '备注',
+                'total' => '总额'
             ];
 
             $export = new ExportExcelServer();