From 410ed5dc8c57faad5d623f1131db7d3e9adbde84 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 26 Apr 2024 14:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=82=A1=E4=B8=9C=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantRepository.php      | 17 ++++++++++-------
 app/controller/api/Agent.php                    | 12 ++++++++++++
 app/controller/api/Auth.php                     |  1 +
 route/api.php                                   |  1 +
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index d25f49d..2bed838 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -80,25 +80,28 @@ class MerchantRepository extends BaseRepository
         $count = $query->count($this->dao->getPk());
         $list = $query->page($page, $limit)->setOption('field', [])
             ->with([
-                'admin' => function ($query) {
+                'admin'        => function($query){
                     $query->field('mer_id,account');
                 },
                 'merchantCategory',
                 'merchantType',
-                'shopMer' => function ($query) {
+                'shopMer'      => function($query){
                     $query->field('mer_id,mer_name,shop_mer_id');
                 },
-                'merShop' => function ($query) {
+                'merShop'      => function($query){
                     $query->field('mer_id,mer_name,shop_mer_id');
                 },
-                'brand' => function ($query) {
+                'brand'        => function($query){
                     $query->field('id,title');
                 },
-                'agent'=>function($query){
+                'agent'        => function($query){
                     $query->field('id,contact_name,agent_type');
-                }
+                },
+                'shareholders' => function($query){
+                    $query->field('uid,nickname,avatar');
+                },
             ])
-            ->field('merchant_type,sort,mer_id,mer_name,real_name,mer_phone,mer_address,mark,status,create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,ot_margin,mer_avatar,margin_remind_time,agent_id,shop_mer_id,brand_id')->select();
+            ->field('resource_shareholders_uid,merchant_type,sort,mer_id,mer_name,real_name,mer_phone,mer_address,mark,status,create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,ot_margin,mer_avatar,margin_remind_time,agent_id,shop_mer_id,brand_id')->select();
         return compact('count', 'list');
     }
 
diff --git a/app/controller/api/Agent.php b/app/controller/api/Agent.php
index ee830bd..9b6dc15 100644
--- a/app/controller/api/Agent.php
+++ b/app/controller/api/Agent.php
@@ -400,7 +400,19 @@ class Agent extends BaseController{
 
         return app('json')->success($data);
     }
+    /**
+     * Common: 修改资源股东
+     * Author: wu-hui
+     * Time: 2024/04/26 14:38
+     * @return mixed
+     */
+    public function updateShareholders(){
+        $params = $this->request->params(['mer_id', 'resource_shareholders_uid']);
 
+        Merchant::update(['resource_shareholders_uid'=>$params['resource_shareholders_uid']],['mer_id'=>$params['mer_id']]);
+
+        return app('json')->success('编辑成功');
+    }
 
 
 
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index ad6b509..a8beec1 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -785,6 +785,7 @@ class Auth extends BaseController
         $userInfo = app()->make(UserRepository::class)
             ->getSearch([])
             ->field(['uid','real_name','nickname','avatar','phone'])
+            ->whereNull('cancel_time')
             // 用户ID/联系电话
             ->when(!empty($search['id_and_phone']),function($query) use ($search){
                 $query->where(function($query) use ($search){
diff --git a/route/api.php b/route/api.php
index 205406e..261464a 100644
--- a/route/api.php
+++ b/route/api.php
@@ -406,6 +406,7 @@ Route::group('api/', function () {
             Route::get('identity_list', 'getIdentityList');// 获取用户身份信息列表
             Route::get('role_and_correlation_role', 'getRoleAndCorrelationRole');// 获取指定角色及相关角色的信息
             Route::get('my_invite', 'getMyInvite');// 我的邀请（商户）
+            Route::post('update_shareholders', 'updateShareholders');// 修改资源股东
 
 
         })->prefix('api.Agent/');