From afedf06e01d5b959250cd6bc5a1a0f32fb82181e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 18 Jun 2024 10:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=95=86=E5=85=B3=E8=81=94=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/AgentDeliveryRepository.php         | 31 +++++++++++++++++--
 .../api/marketing/agent/Delivery.php          | 23 ++++++++++++--
 route/api.php                                 |  2 ++
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/marketing/agent/AgentDeliveryRepository.php b/app/common/repositories/marketing/agent/AgentDeliveryRepository.php
index b0e91f0..f54969a 100644
--- a/app/common/repositories/marketing/agent/AgentDeliveryRepository.php
+++ b/app/common/repositories/marketing/agent/AgentDeliveryRepository.php
@@ -4,7 +4,9 @@ namespace app\common\repositories\marketing\agent;
 
 use app\common\dao\marketing\agent\AgentDeliveryDao;
 use app\common\model\marketing\agent\AgentDelivery;
+use app\common\model\system\merchant\Merchant;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\marketing\AgentRepository;
 use app\common\repositories\store\order\StoreOrderCreateRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use crmeb\services\LockService;
@@ -78,12 +80,37 @@ class AgentDeliveryRepository extends BaseRepository{
      */
     public function createPaymentRecord($params){
         return AgentDelivery::insertGetId([
-            'agent_id' => $params['agent_id'] ?? 0,
-            'price' => $params['money'] ?? 0,
+            'agent_id'    => $params['agent_id'] ?? 0,
+            'price'       => $params['money'] ?? 0,
             'title_quota' => $params['title_quota'] ?? 0,
             'other_quota' => $params['other_quota'] ?? 0,
         ]);
     }
+    /**
+     * Common: 获取配送商相关的商户信息
+     * Author: wu-hui
+     * Time: 2024/06/18 9:47
+     * @param array $params
+     * @param int   $page
+     * @param int   $limit
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getMerList(array $params,int $page,int $limit){
+        $query = Merchant::where('agent_id',(int)$params['agent_id'])
+            ->field('mer_id,mer_name,mer_phone,mer_address,mer_avatar')
+            ->when(isset($params['search_text']) && $params['search_text'] !==  '',function($query) use ($params){
+                $query->whereLike('mer_name|mer_phone', "%{$params['search_text']}%");
+            })
+            ->order("mer_id DESC");
+        $count = $query->count();
+        $list = $query->page($page,$limit)->select()->toArray();
+
+        return compact('count','list');
+    }
+
 
 
 
diff --git a/app/controller/api/marketing/agent/Delivery.php b/app/controller/api/marketing/agent/Delivery.php
index db8cd7d..d8bcee4 100644
--- a/app/controller/api/marketing/agent/Delivery.php
+++ b/app/controller/api/marketing/agent/Delivery.php
@@ -66,10 +66,29 @@ class Delivery extends BaseController{
         if($res) return $res;
         else return app('json')->success("操作成功");
     }
-
+    // 缴费记录获取
     public function paymentRecord(){}
+    /**
+     * Common: 获取相关商户
+     * Author: wu-hui
+     * Time: 2024/06/18 9:47
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function merList(){
+        // 参数处理
+        [$page,$limit] = $this->getPage();
+        $params = $this->request->params([
+            ['agent_id',0],
+            ['search_text',''],
+        ]);
+        // 信息列表获取
+        $data = $this->repository->getMerList((array)$params,(int)$page,(int)$limit);
 
-
+        return app('json')->success($data);
+    }
 
 
 
diff --git a/route/api.php b/route/api.php
index 6cf3dcf..a21c37d 100644
--- a/route/api.php
+++ b/route/api.php
@@ -423,6 +423,8 @@ Route::group('api/', function () {
             Route::post('delivery/create_order', 'Delivery/createOrder');// 生成支付订单
             Route::get('delivery/payment_record', 'Delivery/paymentRecord');// 缴费记录
 
+            Route::get('delivery/mer_list', 'Delivery/merList');// 绑定商户
+
 
 
         })->prefix('api.marketing.agent.');