From b2da511be835b2ba1bb0a5ac2999c9a6e9f6d0e7 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 14 Jun 2024 17:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=20-=20=E8=82=A1=E4=B8=9C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/MerchantShareholderDao.php       |  6 +++
 .../system/merchant/MerchantShareholder.php   |  7 +++
 .../admin/system/merchant/Shareholder.php     | 48 +++++++++++++++++++
 .../system/merchant/ShareholderLevel.php      |  2 +-
 route/admin/merchant.php                      |  3 +-
 5 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 app/controller/admin/system/merchant/Shareholder.php

diff --git a/app/common/dao/system/merchant/MerchantShareholderDao.php b/app/common/dao/system/merchant/MerchantShareholderDao.php
index 5ca429f..96041cb 100644
--- a/app/common/dao/system/merchant/MerchantShareholderDao.php
+++ b/app/common/dao/system/merchant/MerchantShareholderDao.php
@@ -46,6 +46,12 @@ class MerchantShareholderDao extends BaseDao{
             ->with([
                 'user' => function($query){
                     $query->field('uid,nickname,avatar,phone');
+                },
+                'merchant' => function($query){
+                    $query->field('mer_id,mer_avatar,mer_name');
+                },
+                'level' => function($query){
+                    $query->field('id,title as level_name')->bind(['level_name']);
                 }
             ])
             ->order('create_time DESC,id DESC');
diff --git a/app/common/model/system/merchant/MerchantShareholder.php b/app/common/model/system/merchant/MerchantShareholder.php
index d4871dd..bb78d3e 100644
--- a/app/common/model/system/merchant/MerchantShareholder.php
+++ b/app/common/model/system/merchant/MerchantShareholder.php
@@ -21,6 +21,13 @@ class MerchantShareholder extends BaseModel{
         return $this->hasOne(User::class, 'uid', 'uid');
     }
 
+    public function merchant(){
+        return $this->hasOne(Merchant::class,'mer_id','mer_id');
+    }
+
+    public function level(){
+        return $this->hasOne(MerchantShareholderLevel::class,'id','level_id');
+    }
 
 
 }
diff --git a/app/controller/admin/system/merchant/Shareholder.php b/app/controller/admin/system/merchant/Shareholder.php
new file mode 100644
index 0000000..30b7f88
--- /dev/null
+++ b/app/controller/admin/system/merchant/Shareholder.php
@@ -0,0 +1,48 @@
+<?php
+namespace app\controller\admin\system\merchant;
+
+
+use app\common\repositories\system\merchant\MerchantShareholderRepository;
+use crmeb\basic\BaseController;
+use think\App;
+
+
+class Shareholder extends BaseController{
+
+    protected $repository;
+
+    public function __construct(App $app, MerchantShareholderRepository $repository){
+        parent::__construct($app);
+
+        $this->repository = $repository;
+    }
+    /**
+     * Common: 信息列表
+     * Author: wu-hui
+     * Time: 2024/06/14 17:22
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getList(){
+        [$page, $limit] = $this->getPage();
+        $params = $this->request->params(['level_id','mer_id','uid','search_text']);
+        $data = $this->repository->getList((array)$params,(int)$page,(int)$limit);
+
+        return app('json')->success($data);
+    }
+    /**
+     * Common: 删除信息
+     * Author: wu-hui
+     * Time: 2024/06/14 17:38
+     * @param $id
+     * @return mixed
+     */
+    public function delInfo($id){
+        $this->repository->getSearchModel(['id' => $id])->delete();
+
+        return app('json')->success('删除成功');
+    }
+
+}
diff --git a/app/controller/admin/system/merchant/ShareholderLevel.php b/app/controller/admin/system/merchant/ShareholderLevel.php
index 84ced3f..fb40524 100644
--- a/app/controller/admin/system/merchant/ShareholderLevel.php
+++ b/app/controller/admin/system/merchant/ShareholderLevel.php
@@ -73,7 +73,7 @@ class ShareholderLevel extends BaseController{
         return app('json')->success('编辑成功');
     }
     /**
-     * Common: 生成信息
+     * Common: 删除信息
      * Author: wu-hui
      * Time: 2024/06/12 14:44
      * @param $id
diff --git a/route/admin/merchant.php b/route/admin/merchant.php
index 0c62939..7b9860b 100644
--- a/route/admin/merchant.php
+++ b/route/admin/merchant.php
@@ -168,7 +168,8 @@ Route::group(function () {
         Route::post('shareholder_level/get_form','.ShareholderLevel/getEditForm')->name('systemMerchantShareholderLevelGetForm');
         Route::post('shareholder_level/set_form','.ShareholderLevel/setEditForm')->name('systemMerchantShareholderLevelSetForm');
         Route::post('shareholder_level/del_info/:id','.ShareholderLevel/delInfo')->name('systemMerchantShareholderLevelDelInfo');
-
+        Route::get('shareholder/list','.Shareholder/getList')->name('systemMerchantShareholderGetList');
+        Route::post('shareholder/del_info/:id','.Shareholder/delInfo')->name('systemMerchantShareholderDelInfo');