1

application/index/service/AmercementService.php

@@ -15,6 +15,7 @@ use app\api_broker\service\RedisCacheService;
 use app\index\untils\ExportExcelUntil;
 use app\model\OAmercementImgModel;
 use app\model\OAmercementModel;
+use app\model\UserAgentModel;
 
 class AmercementService
 {
@@ -400,6 +401,7 @@ class AmercementService
     public function getAmercementListPc($params,$page_no, $page_size)
     {
         $conditions=$this->buildConditions($params);
+        big_log($conditions);
         $field = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time,forfeit_penalty";
         $result = $this->m_amercement->getAmercementList($conditions, $field, $page_no, $page_size);
         $redis_cache = new RedisCacheService();
@@ -417,7 +419,7 @@ class AmercementService
             $agent_data = $redis_cache->getRedisCache(2, $val['agent_id']);
             $result[$key]['agent_name']     = $agent_data['name'];
 
-            $result['money_sum'] = $result[$key]['forfeit_penalty'] + $val['money'];//罚款总金额
+            $result[$key]['money_sum'] = $result[$key]['forfeit_penalty'] + $val['money'];//罚款总金额
         }
         $result_['list']  = $result;
         $result_['total'] = $result = $this->m_amercement->getAmercementTotal($conditions, $field);
@@ -449,6 +451,9 @@ class AmercementService
             $result[$key]['submit_agent_name']     = $agent_data['name'];
             $agent_data = $redis_cache->getRedisCache(2, $val['agent_id']);
             $result[$key]['agent_name']     = $agent_data['name'];
+
+            $result[$key]['money_sum'] = $result[$key]['forfeit_penalty'] + $val['money'];//罚款总金额
+
         }
         $export = new ExportExcelUntil();
         $e_data_new = [];
@@ -461,11 +466,12 @@ class AmercementService
             $e_data_old['6'] = $v['agent_name'];
             $e_data_old['7'] = $v['status_name'];
             $e_data_old['8'] = $v['forfeit_penalty'];
+            $e_data_old['9'] = $v['money_sum'];
             $e_data_new[] = $e_data_old;
         }
 
-        $field_num = 7;
-        $title  = [ '罚款ID', '罚款项目', '提交时间', '提交人', '罚款金额', '被罚款人', '状态', '滞纳金'];
+        $field_num = 9;
+        $title  = [ '罚款ID', '罚款项目', '提交时间', '提交人', '罚款金额', '被罚款人', '状态', '滞纳金','付款金额'];
         $title2 = '罚款账单表';
         $export->exportTable('罚款账单表', $e_data_new, $field_num, $title2, $title);
 
@@ -506,12 +512,14 @@ class AmercementService
 
         //提交人姓名
         if (!empty($params['submit_name'])) {
-            $conditions["id"] = $params["id"];
+            $user_id_str = $this->getUserIDList($params['submit_name']);
+            $conditions['submit_agent_id'] = ['in', $user_id_str];
         }
 
         //被罚款人姓名
         if (!empty($params['name'])) {
-            $conditions["id"] = $params["id"];
+            $user_id_str = $this->getUserIDList($params['name']);
+            $conditions['agent_id'] = ['in', $user_id_str];
         }
         return $conditions;
     }
@@ -539,5 +547,32 @@ class AmercementService
     }
 
 
+    /**
+     * 查询客方id集合
+     * @param $name
+     * @return string
+     */
+    public function getUserIDList($name)
+    {
+        //查询总监下面门店的所有经纪人
+        $params = [];
+        $params['name'] = [ 'LIKE', '%' . $name . '%' ];
+        $params["is_del"] = 0;
+        $m_user_agent = new UserAgentModel();
+        $field = 'user_id';
+        $res = $m_user_agent->selectUser($field, $params);
+
+        $user_id_str = "";
+        if (count($res) > 0) {
+            foreach ($res as $k => $v) {
+                $user_id_str .= $v["user_id"] . ",";
+            }
+            $user_id_str = rtrim($user_id_str, ",");
+        }
+
+        return $user_id_str;
+    }
+
+
 
 }
\ No newline at end of file