修改

Controller/NewCommission/ApiNewCommissionPartner.Class.php

@@ -68,30 +68,30 @@ class ApiNewCommissionPartner extends BaseController
         }
         $selectParams["where"] = $where;
         
-        $testData=[
-            "total"=>1,
-            "data"=>[
-                [
-                    "avatar"=>"https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132",
-                    "title"=>"子级合伙人收益分佣",
-                    "type"=>1,
-                    "calcMoney"=>100,
-                    "commission"=>10,
-                    "name"=>"影子",
-                    "time"=>1000000,
-                ],
-                [
-                    "avatar"=>"https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132",
-                    "title"=>"子级消费分佣",
-                    "type"=>0,
-                    "calcMoney"=>100,
-                    "commission"=>10,
-                    "name"=>"影子",
-                    "time"=>1000000,
-                ],
-            ],
-        ];
-        parent::sendOutput($testData);
+//        $testData=[
+//            "total"=>1,
+//            "data"=>[
+//                [
+//                    "avatar"=>"https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132",
+//                    "title"=>"子级合伙人收益分佣",
+//                    "type"=>1,
+//                    "calcMoney"=>100,
+//                    "commission"=>10,
+//                    "name"=>"影子",
+//                    "time"=>1000000,
+//                ],
+//                [
+//                    "avatar"=>"https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132",
+//                    "title"=>"子级消费分佣",
+//                    "type"=>0,
+//                    "calcMoney"=>100,
+//                    "commission"=>10,
+//                    "name"=>"影子",
+//                    "time"=>1000000,
+//                ],
+//            ],
+//        ];
+//        parent::sendOutput($testData);
         
         $data = $this->partnerTool->getCommissionDetail($this->customerData["id"],$selectParams);
         parent::sendOutput($data);

Controller/NewCommission/NewCommissionPartner.Class.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * api新分销商合伙人Controller
+ * Created by PhpStorm.
+ * User: haoren
+ * Date: 2020/07/22
+ * Time: 15:00
+ */
+
+namespace JinDouYun\Controller\NewCommission;
+
+use Exception;
+use Mall\Framework\Core\ErrorCode;
+use Mall\Framework\Core\ResultWrapper;
+use Mall\Framework\Core\StatusCode;
+use JinDouYun\Controller\BaseController;
+
+use Util\Common\PartnerTools;
+use JinDouYun\Model\Customer\MCustomer;
+
+class NewCommissionPartner extends BaseController
+{
+    
+    private $customerData;
+    private $partnerTool;
+
+    public function __construct($isCheckAcl = true, $isMustLogin = true)
+    {
+        parent::__construct($isCheckAcl, $isMustLogin);
+        $this->partnerTool = new PartnerTools($this->onlineEnterpriseId);
+        $this->customerData = $this->partnerTool->getCustomerDataByUserCenterId($this->onlineUserId);
+
+    }
+    
+    /**
+     * 获取分销合伙人数据列表
+     */
+    public function getDataList(){
+        $params = $this->request->getRawJson();
+        if(empty($params)){
+            $this->sendOutput('参数为空', ErrorCode::$paramError);
+        }
+        $selectParams = [];
+        $params['page'] = isset($params['page']) ? $params['page'] : 1;
+        $params['pageSize'] = isset($params['pageSize']) ? $params['pageSize'] : 10;
+        $pageParams = pageToOffset($params['page'], $params['pageSize']);
+        $selectParams['limit'] = $pageParams['limit'];
+        $selectParams['offset'] = $pageParams['offset'];
+
+        if(isset($params['search']) && !empty($params['search'])){
+            $selectParams['search'] = $params['search'];
+        }
+        $res = $this->partnerTool->getPartnerList($selectParams);
+        $pageData = [
+            'pageIndex' => $params['page'],
+            'pageSize' => $params['pageSize'],
+            'pageTotal' => $res['total'],
+        ];
+        parent::sendOutput($res['data'], 0, $pageData);
+
+        
+    }
+    
+    
+    
+
+}

Util/Common/PartnerTools.Class.php

@@ -764,6 +764,42 @@ class PartnerTools{
         return $data;
     }
     
+    /**
+     * 获取合伙人列表
+     * @param type $params
+     */
+    public function getPartnerList($params = []){
+        $customerTableName = 'qianniao_customer_'.$this->enterpriseId;
+        $userCenterTableName = 'qianniao_user_center';
+        $newCommissionPartnerTableName = 'qianniao_new_commission_partner_'.$this->enterpriseId;
+        //查询数据
+        $field = "p.*,u.mobile,c.name,c.avatar";
+        $sql = "select {$field} from {$newCommissionPartnerTableName} p "
+        . "left join {$userCenterTableName} u on u.id = p.userCenterId "
+        . "left join {$customerTableName} c on c.id = p.customerId";
+        $whereSql = 'p.deleteStatus = 5';
+        if(isset($params['search'])){
+            $whereSql .= ' and (u.mobile like "%'.$params['search'].'%" or c.name like "%'.$params['search'].'%") ';
+        }
+        $orderSql = ' order by p.id desc ';
+        $limitSql = ' limit '.$params['offset'].','.$params['limit'];
+        $querySql = $sql.$whereSql.$orderSql.$limitSql;
+        $data = $this->dbNewCommissionPartner->query($querySql);
+        if(empty($data)){
+            $data=[];
+        }
+        //查询总数
+        $countSql = "select count(*) as `count` from {$newCommissionPartnerTableName} p "
+        . "left join {$userCenterTableName} u on u.id = p.userCenterId "
+        . "left join {$customerTableName} c on c.id = p.customerId";
+        $countData = $this->dbNewCommissionPartner->query($countSql.$whereSql);
+        $total = 0;
+        if(!empty($countData)){
+            $total =array_shift($countData)['count'];
+        }
+        return ['data'=>$data,'total'=>($total) ? intval($total) : 0];
+    }
+