From d11b8ee00a4205dff63d6583d6f2c3298bbe2ac2 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 13 Sep 2023 20:23:41 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=95=86=E6=88=B7=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/ShopMerchantLists.php | 158 ++++++++++++-----------
 1 file changed, 82 insertions(+), 76 deletions(-)

diff --git a/app/adminapi/lists/ShopMerchantLists.php b/app/adminapi/lists/ShopMerchantLists.php
index c4f479652..1dfa58cf7 100644
--- a/app/adminapi/lists/ShopMerchantLists.php
+++ b/app/adminapi/lists/ShopMerchantLists.php
@@ -1,77 +1,83 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\lists;
-
-
-use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\ShopMerchant;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * ShopMerchant列表
- * Class ShopMerchantLists
- * @package app\adminapi\lists
- */
-class ShopMerchantLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
-    /**
-     * @notes 设置搜索条件
-     * @return \string[][]
-     * @author likeadmin
-     * @date 2023/09/13 16:45
-     */
-    public function setSearch(): array
-    {
-        return [
-            '=' => ['company_name', 'master_name', 'master_phone'],

-        ];
-    }
-
-
-    /**
-     * @notes 获取列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author likeadmin
-     * @date 2023/09/13 16:45
-     */
-    public function lists(): array
-    {
-        return ShopMerchant::where($this->searchWhere)
-            ->field(['id', 'company_name', 'organization_code', 'master_name', 'master_phone'])
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-    }
-
-
-    /**
-     * @notes 获取数量
-     * @return int
-     * @author likeadmin
-     * @date 2023/09/13 16:45
-     */
-    public function count(): int
-    {
-        return ShopMerchant::where($this->searchWhere)->count();
-    }
-
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\ShopMerchant;
+use app\common\lists\ListsSearchInterface;
+use think\facade\Db;
+
+
+/**
+ * ShopMerchant列表
+ * Class ShopMerchantLists
+ * @package app\adminapi\lists
+ */
+class ShopMerchantLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2023/09/13 16:45
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['company_name', 'master_name', 'master_phone'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2023/09/13 16:45
+     */
+    public function lists(): array
+    {
+        return ShopMerchant::where($this->searchWhere)
+            ->field(['id', 'company_name', 'organization_code', 'master_name', 'master_phone'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->append(['notes'], true)
+            ->withAttr('notes',function($value,$data){
+                return Db::name('company_authentication_fail_log')->where('company_id',$data['id'])->where('log_type', 3)->order(['id'=>'desc'])->limit(1)->value('fail_reason');
+            })
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author likeadmin
+     * @date 2023/09/13 16:45
+     */
+    public function count(): int
+    {
+        return ShopMerchant::where($this->searchWhere)->count();
+    }
+
 }
\ No newline at end of file