Merge branch 'master' of http://git.bocai108.com:10180/aqm/sports_admin

app/Lib/Settlement/Adapter/ZqRule.php

@@ -102,7 +102,6 @@ class ZqRule
         $word = $home . '-' . $guest . '(全场)';
         $ret = $this->zq_inball_bigsmall($total, $model->condition, 2, $word);
         return $ret;
-        //return $this->sizeFull($model, $resultModel, $resultRecords, 0, 1);
     }
 
     /**
@@ -112,74 +111,15 @@ class ZqRule
      * @param mixed $resultRecords 结果记录表数据
      * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
      */
-    public function goal_size_guest($model, $resultModel, $resultRecords)
-    {
-        return $this->sizeFull($model, $resultModel, $resultRecords, 0, -1);
-    }
-
-    /**
-     * 总进球全场|[主、客、全]|大小
-     * @param mixed $model 注单表数据
-     * @param mixed $resultModel 结果表数据
-     * @param mixed $resultRecords 结果记录表数据
-     * @param mixed $type 1：主队  2：客队 0：全部进球 (目前只传 0)
-     * @param mixed $size 1：大  -1：小
-     * @return string 1：赢  -1：输  2：平  3：赢半平半  4：输半平半
-     */
-    public function sizeFull($model, $resultModels, $resultRecords, $type, $size)
+    public function goal_size_guest($model, $resultModels, $resultRecords)
     {
         $resultModel = $resultModels['0'];
-        // 总进球数
-        $allGoal = intval($resultModel->home_score) + intval($resultModel->guest_score);
-        // 主队进球数
-        $homeGoal = intval($resultModel->home_score);
-        // 客队进球数
-        $guestGoal = intval($resultModel->guest_score);
-        // 条件
-        $condition = explode("/", $model->condition);
-        $resultArr = [];
-        // 循环对比输赢
-        foreach ($condition as $value) {
-            $absValue = abs($value);
-            if ($type == 1) {
-                $resultScore = $homeGoal - $absValue;
-            } elseif ($type == 2) {
-                $resultScore = $guestGoal - $absValue;
-            } else {
-                $resultScore = $allGoal - $absValue;
-            }
-
-            if ($resultScore > 0) {
-                $resultArr[] = 1;
-            } elseif ($resultScore < 0) {
-                $resultArr[] = -1;
-            } else {
-                $resultArr[] = 0;
-            }
-        }
-        // 去重
-        $resultUniqueArr = array_unique($resultArr);
-
-        // 循环对比让球后输赢
-        $count = count($resultUniqueArr);
-        if ($count == 1) {
-            // 如果猜中
-            if ($resultUniqueArr[0] == $size) {
-                $data['result'] = 1;
-            } elseif ($resultUniqueArr[0] == 0) {
-                // 如果平
-                $data['result'] = 2;
-            } else {
-                // 如果猜错
-                $data['result'] = -1;
-            }
-        } elseif (in_array($size, $resultUniqueArr)) {
-            $data['result'] = 3;
-        } else {
-            $data['result'] = 4;
-        }
-        $data['matchResult'] = "$homeGoal-$guestGoal(全场)";
-        return $data;
+        $home = intval($resultModel->u_home_score);
+        $guest = intval($resultModel->u_guest_score);
+        $total = $home + $guest;
+        $word = $home . '-' . $guest . '(全场)';
+        $ret = $this->zq_inball_bigsmall($total, $model->condition, 1, $word);
+        return $ret;
     }
 
 
@@ -345,7 +285,8 @@ class ZqRule
     public function first_ball_home($model, $resultModel, $resultRecords)
     {
         $resultModel = $resultModel['0'];
-        $word = $resultModel->first_score ? $resultModel->first_score : '无';
+        $word = ($resultModel->first_score != '') ? (($resultModel->first_score == $model->home_team) ? '1:0' : '0:1') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->first_score) == trim($resultModel->home_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -359,7 +300,8 @@ class ZqRule
     public function first_ball_guest($model, $resultModel, $resultRecords)
     {
         $resultModel = $resultModel['0'];
-        $word = $resultModel->first_score ? $resultModel->first_score : '无';
+        $word = ($resultModel->first_score != '') ? (($resultModel->first_score == $model->guest_team) ? '0:1' : '1:0') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->first_score) == trim($resultModel->guest_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -373,7 +315,8 @@ class ZqRule
     public function last_ball_home($model, $resultModel, $resultRecords)
     {
         $resultModel = $resultModel['0'];
-        $word = $resultModel->last_score ? $resultModel->first_score : '无';
+        $word = ($resultModel->last_score != '') ? (($resultModel->last_score == $model->home_team) ? '1:0' : '0:1') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->last_score) == trim($resultModel->home_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -387,9 +330,9 @@ class ZqRule
     //客队|最后进球
     public function last_ball_guest($model, $resultModel, $resultRecords)
     {
-        $pos = count($resultModel) - 1;
-        $resultModel = $resultModel[$pos];
-        $word = $resultModel->last_score ? $resultModel->first_score : '无';
+        $resultModel = $resultModel['0'];
+        $word = ($resultModel->last_score != '') ? (($resultModel->last_score == $model->guest_team) ? '0:1' : '1:0') : '0:0';
+        $word .= '(主客)';
 
         if (trim($resultModel->last_score) == trim($resultModel->guest_team)) {
             return ['result' => 1, 'matchResult' => $word];
@@ -402,10 +345,11 @@ class ZqRule
     //没有进球
     public function not_ball($model, $resultModel, $resultRecords)
     {
-        $pos = count($resultModel) - 1;
-        $resultModel = $resultModel[$pos];
-        $all_score = intval($resultModel->home_score) + intval($resultModel->guest_score);
-        $word = $resultModel->first_score ? $resultModel->first_score : '无';
+        $resultModel = $resultModel['0'];
+        $home = intval($resultModel->home_score);
+        $guest = intval($resultModel->guest_score);
+        $all_score = $home + $guest;
+        $word = ($home > 0 ? 1 : 0) . '-' . ($guest > 0 ? 1 : 0) . '(主客)';
 
         if ($all_score <= 0) {
             return ['result' => 1, 'matchResult' => $word];