优化

application/api/controller/AppointmentTime.php

@@ -255,31 +255,43 @@ class AppointmentTime extends Basic
                     $result[$key]["images"] = count($res) > 0 ? $res : [];
                 }
             }
-            //是否评价
-            $evaluateResult = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
-            $evaluate_count = count($evaluateResult);
-            if ($evaluate_count == 0) {
-                $is_evaluate = 0;
-            } elseif ($evaluate_count == 1) {
-                $is_evaluate = 1;
-            } else {
-                $is_evaluate = 2;
-            }
 
-            //收款
-            $is_pay = 0;
-            $field_pay_log = "id,report_id";
-            $m_paylog = new OPayLogModel();
-            $payLogData = $m_paylog->selectPayLogByOrderNo($field_pay_log, ["report_id" => $val["id"]]);
-            if (count($payLogData) > 0) {
-                $is_pay = 1;
-            }
-            $result[$key]["is_evaluate"] = $is_evaluate;//0 无评价 1 有首次评价 2 有追评 7151
-            $result[$key]["is_pay"] = $is_pay;//是否有收款
+            $result[$key]["is_evaluate"] = $this->isEvaluate($val["id"],$params["user_id"]);
         }
         return $result;
     }
 
+    /**
+     * 评价，追评 标签显示
+     * 0 显示评价经纪人 1 显示追评 2 显示已评价 7151
+     * @param $report_id
+     * @param $user_id
+     * @return int
+     */
+    public function isEvaluate($report_id,$user_id){
+        //是否评价
+        $evaluateResult = $this->evaluateMode->getIsEvaluate(10, $report_id, $user_id);
+        $evaluate_count = count($evaluateResult);
+
+        //收款
+        $is_pay = 0;
+        $field_pay_log = "id,report_id";
+        $m_paylog = new OPayLogModel();
+        $payLogData = $m_paylog->selectPayLogByOrderNo($field_pay_log, ["report_id" => $report_id]);
+        if (count($payLogData) > 0) {
+            $is_pay = 1;
+        }
+
+        if ($evaluate_count == 0) {
+            $is_evaluate = 0;
+        } elseif (($evaluate_count == 1)&&($is_pay == 1)) {
+            $is_evaluate = 1;
+        } else {
+            $is_evaluate = 2;
+        }
+        return $is_evaluate;
+    }
+
     /**
      * @param $pageNo
      * @param $pageSize