From 19bf45ac9786807978f1259b5403f09a9195f151 Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Fri, 8 Aug 2025 23:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BD=A3=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent/admin/controllers/pingan/user/Cmmssn.php   | 12 ++++++++++--
 .../entity/ReceiverOrderSubsidyEntity.php        | 16 +++++++++++-----
 common/models/receiver/Receiver_clues_model.php  | 16 +++++++++++-----
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/agent/admin/controllers/pingan/user/Cmmssn.php b/agent/admin/controllers/pingan/user/Cmmssn.php
index 83c9f3af..58096d6a 100644
--- a/agent/admin/controllers/pingan/user/Cmmssn.php
+++ b/agent/admin/controllers/pingan/user/Cmmssn.php
@@ -14,11 +14,13 @@ class Cmmssn extends BaseController
         $this->load->model('agent/pingan/pingan_users_cmmssn_model', 'pinganUsersCmmssn');
         $this->load->model('agent/auto_product_model', 'autoProduct');
         $this->load->model('receiver/receiver_clues_model', 'clues_model');
+        $this->load->model('receiver/receiver_orders_model');
         $this->load->model('auto/auto_brand_model');
         $this->load->model('auto/auto_series_model');
         $this->auto_brand_model->set_db('ssdb');
         $this->auto_series_model->set_db('ssdb');
         $this->clues_model->set_db('ssdb');
+        $this->receiver_orders_model->set_db('ssdb');
     }
 
     public function page_get()
@@ -63,7 +65,7 @@ class Cmmssn extends BaseController
             $types = implode(',', $types);
             $where["cfType in ({$types})"] = null;
         }
-        if($brands[1]){
+        if ($brands[1]) {
             $seriesId = $brands[1];
             $subSql = "select id from lc_auto_product where seriesId={$seriesId}";
             $where["sourceId in ($subSql)"] = null;
@@ -79,7 +81,13 @@ class Cmmssn extends BaseController
             /** @var PinganUsersCmmssnEntity[] $rows */
             $rows = $this->pinganUsersCmmssn->select($where, 'id desc', $page, $limit, '', 'PinganUsersCmmssnEntity');
             foreach ($rows as $item) {
-                $cluesRow = $this->clues_model->get(['id' => $item->cfId]);
+                if ($item->cfType == Pingan_users_cmmssn_model::CF_TYPE_CLUES_OWN
+                    || $item->cfType == Pingan_users_cmmssn_model::CF_TYPE_CLUES_TEAM) { //线索
+                    $cluesRow = $this->clues_model->get(['id' => $item->cfId]);
+                } else {
+                    $orderRow = $this->receiver_orders_model->get(['id' => $item->cfId]);
+                    $cluesRow = $this->clues_model->get(['id' => $orderRow['clue_id']]);
+                }
                 $productRow = $this->autoProduct->get(['id' => $item->sourceId]);
                 $brandRow = $this->auto_brand_model->get(['id' => $productRow['brandId']]);
                 $seriesRow = $this->auto_series_model->get(['id' => $productRow['seriesId']]);
diff --git a/common/libraries/entity/ReceiverOrderSubsidyEntity.php b/common/libraries/entity/ReceiverOrderSubsidyEntity.php
index b87dee5d..82f2fe38 100644
--- a/common/libraries/entity/ReceiverOrderSubsidyEntity.php
+++ b/common/libraries/entity/ReceiverOrderSubsidyEntity.php
@@ -180,6 +180,7 @@ class ReceiverOrderSubsidyEntity
             if (!$clues['out_id']) {
                 throw new Exception("报名来源不存在");
             }
+            $sourceId = $clues['out_id'];
             $pinanUser = $ci->pingan_users_model->get(['id' => $clues['pingan_user_id']]);
             if (!$pinanUser['id']) {
                 throw new Exception("线索不存在绑定用户关系");
@@ -207,7 +208,8 @@ class ReceiverOrderSubsidyEntity
                     'depId' => 0,
                     'areaId' => $clues['area_id'],
                     'createTime' => date('Y-m-d H:i:s'),
-                    'bizId' => $this->bizId
+                    'bizId' => $this->bizId,
+                    'sourceId' => $sourceId
                 ];
             }
             if ($brokerage2 && $clues['dep_id']) { //二级佣金
@@ -220,7 +222,8 @@ class ReceiverOrderSubsidyEntity
                     'depId' => $clues['dep_id'],
                     'areaId' => $clues['area_id'] ?: 0,
                     'createTime' => date('Y-m-d H:i:s'),
-                    'bizId' => $this->bizId
+                    'bizId' => $this->bizId,
+                    'sourceId' => $sourceId
                 ];
             }
             if ($level >= 4) { //4级
@@ -234,7 +237,8 @@ class ReceiverOrderSubsidyEntity
                         'depId' => $clues['dep_id'],
                         'areaId' => $clues['area_id'] ?: 0,
                         'createTime' => date('Y-m-d H:i:s'),
-                        'bizId' => $this->bizId
+                        'bizId' => $this->bizId,
+                        'sourceId' => $sourceId
                     ];
                 }
                 if ($brokerage4 && $clues['pingan_user_id']) {
@@ -247,7 +251,8 @@ class ReceiverOrderSubsidyEntity
                         'depId' => $clues['dep_id'],
                         'areaId' => $clues['area_id'] ?: 0,
                         'createTime' => date('Y-m-d H:i:s'),
-                        'bizId' => $this->bizId
+                        'bizId' => $this->bizId,
+                        'sourceId' => $sourceId
                     ];
                 }
             } else { //三级
@@ -261,7 +266,8 @@ class ReceiverOrderSubsidyEntity
                         'depId' => $clues['dep_id'],
                         'areaId' => $clues['area_id'] ?: 0,
                         'createTime' => date('Y-m-d H:i:s'),
-                        'bizId' => $this->bizId
+                        'bizId' => $this->bizId,
+                        'sourceId' => $sourceId
                     ];
                 }
             }
diff --git a/common/models/receiver/Receiver_clues_model.php b/common/models/receiver/Receiver_clues_model.php
index 8a62ba59..790b1afb 100644
--- a/common/models/receiver/Receiver_clues_model.php
+++ b/common/models/receiver/Receiver_clues_model.php
@@ -233,6 +233,7 @@ class Receiver_clues_model extends HD_Model
             $brokerage4 = $money * ($cmmssn['cluesLevel4'] / 100) ?: 0;
             debug_log('分佣金额:' . json_encode([$brokerage1, $brokerage2, $brokerage3, $brokerage4]), $log_path, $log_dir);
             $cfId = $clues['id'];
+            $sourceId = $clues['out_id'];
             $add_data = [];
             if ($brokerage1 && $clues['area_id']) { //一级佣金
                 $add_data[] = [
@@ -244,7 +245,8 @@ class Receiver_clues_model extends HD_Model
                     'depId' => 0,
                     'areaId' => $clues['area_id'],
                     'createTime' => date('Y-m-d H:i:s'),
-                    'bizId' => $bizId
+                    'bizId' => $bizId,
+                    'sourceId' => $sourceId
                 ];
             }
             if ($brokerage2 && $clues['dep_id']) { //二级佣金
@@ -257,7 +259,8 @@ class Receiver_clues_model extends HD_Model
                     'depId' => $clues['dep_id'],
                     'areaId' => $clues['area_id'] ?: 0,
                     'createTime' => date('Y-m-d H:i:s'),
-                    'bizId' => $bizId
+                    'bizId' => $bizId,
+                    'sourceId' => $sourceId
                 ];
             }
             if ($level >= 4) { //4级
@@ -271,7 +274,8 @@ class Receiver_clues_model extends HD_Model
                         'depId' => $clues['dep_id'],
                         'areaId' => $clues['area_id'] ?: 0,
                         'createTime' => date('Y-m-d H:i:s'),
-                        'bizId' => $bizId
+                        'bizId' => $bizId,
+                        'sourceId' => $sourceId
                     ];
                 }
                 if ($brokerage4 && $clues['pingan_user_id']) {
@@ -284,7 +288,8 @@ class Receiver_clues_model extends HD_Model
                         'depId' => $clues['dep_id'],
                         'areaId' => $clues['area_id'] ?: 0,
                         'createTime' => date('Y-m-d H:i:s'),
-                        'bizId' => $bizId
+                        'bizId' => $bizId,
+                        'sourceId' => $sourceId
                     ];
                 }
             } else { //三级
@@ -298,7 +303,8 @@ class Receiver_clues_model extends HD_Model
                         'depId' => $clues['dep_id'],
                         'areaId' => $clues['area_id'] ?: 0,
                         'createTime' => date('Y-m-d H:i:s'),
-                        'bizId' => $bizId
+                        'bizId' => $bizId,
+                        'sourceId' => $sourceId
                     ];
                 }
             }