From c459d0adc927e9b258e7cad7a29a4907b3cff77f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 23 Aug 2024 17:57:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=B0=E6=8F=90=E7=8E=B0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/store_extract/StoreExtractLists.php | 37 ++++++++++++++++++-
 .../StoreBranchProductLogic.php               |  3 +-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/admin/lists/store_extract/StoreExtractLists.php b/app/admin/lists/store_extract/StoreExtractLists.php
index dbb2ec935..966774344 100644
--- a/app/admin/lists/store_extract/StoreExtractLists.php
+++ b/app/admin/lists/store_extract/StoreExtractLists.php
@@ -8,14 +8,16 @@ use app\common\model\store_extract\StoreExtract;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
+use app\common\model\user\UserAuth;
 use app\common\model\user_ship\UserShip;
+use app\common\lists\ListsExcelInterface;
 
 /**
  * 门店提现列表
  * Class StoreExtractLists
  * @package app\admin\listsstore_extract
  */
-class StoreExtractLists extends BaseAdminDataLists implements ListsSearchInterface
+class StoreExtractLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -58,9 +60,11 @@ class StoreExtractLists extends BaseAdminDataLists implements ListsSearchInterfa
                     }else{
                         $name=$find['mobile'];
                     }
+                    $openid=UserAuth::where('uid',$find['id'])->value('openid');
                     $user_ship=UserShip::where('id',$find['user_ship'])->value('title');
                     $item->nickname=$name.'('.$user_ship.')';
-                    // $item->id_card=$name.'('.$user_ship.')';
+                    $item->id_card=$find['id_card'];
+                    $item->openid=$openid;
                 }
             })
             ->toArray();
@@ -78,4 +82,33 @@ class StoreExtractLists extends BaseAdminDataLists implements ListsSearchInterfa
         return StoreExtract::where($this->searchWhere)->count();
     }
 
+           /**
+     * @notes 导出文件名
+     * @return string
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setFileName(): string
+    {
+        return '提现列表';
+    }
+
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        $data=[
+            'nickname' => '名称',
+            'extract_price' => '提现金额',
+            'id_card' => '身份证',
+            'openid' => 'openid',
+            'create_time' => '时间',
+        ];
+        return $data;
+    }
 }
\ No newline at end of file
diff --git a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php
index 45ae5a6e0..dd1effd66 100644
--- a/app/admin/logic/store_branch_product/StoreBranchProductLogic.php
+++ b/app/admin/logic/store_branch_product/StoreBranchProductLogic.php
@@ -122,7 +122,8 @@ class StoreBranchProductLogic extends BaseLogic
             self::setError('商品库存不为0,无法删除');
             return false;
         }
-        return StoreBranchProduct::destroy($params['id']);
+        StoreBranchProduct::destroy($params['id']);
+        return true;
     }