update

app/Lib/Settlement/Adapter/ZqRule.php

@@ -128,7 +128,7 @@ class ZqRule
     {
         $resultModel = $resultModels['0'];
         $allscore = intval($resultModel->home_score) + intval($resultModel->guest_score);
-        $word = $allscore . "(全场)";
+        $word = $resultModel->home_score . '-' . $resultModel->guest_score . "(全场)";
         $returnDatas = $this->zq_inball_bigsmall($allscore, $model->condition, 2, $word);
         return $returnDatas;
 
@@ -139,7 +139,7 @@ class ZqRule
     {
         $resultModel = $resultModels['0'];
         $allscore = intval($resultModel->home_score) + intval($resultModel->guest_score);
-        $word = $allscore . "(全场)";
+        $word = $resultModel->home_score . '-' . $resultModel->guest_score . "(全场)";
         $returnDatas = $this->zq_inball_bigsmall($allscore, $model->condition, 1, $word);
         return $returnDatas;
     }
@@ -155,7 +155,7 @@ class ZqRule
     {
         $resultModel = $resultModels['0'];
         $score = intval($resultModel->u_home_score) + intval($resultModel->u_guest_score);
-        return $this->zq_inball_bigsmall($score, $model->condition, 2, $score . '(上半场)');
+        return $this->zq_inball_bigsmall($score, $model->condition, 2, $resultModel->u_home_score . '-' . $resultModel->u_guest_score . '(上半场)');
     }
 
     /**
@@ -169,7 +169,7 @@ class ZqRule
     {
         $resultModel = $resultModels['0'];
         $score = intval($resultModel->u_home_score) + intval($resultModel->u_guest_score);
-        return $this->zq_inball_bigsmall($score, $model->condition, 1, $score . '(上半场)');
+        return $this->zq_inball_bigsmall($score, $model->condition, 1, $resultModel->u_home_score . '-' . $resultModel->u_guest_score . '(上半场)');
     }
 
 
@@ -436,6 +436,14 @@ class ZqRule
         $resultModel = $resultModels['0'];
         $resulttod = intval($resultModel->home_score) + intval($resultModel->guest_score);//全场
 
+        $score_home = intval($resultModel->home_score);
+        $guest_home = intval($resultModel->guest_score);
+        $word_all = $score_home . '-' . $guest_home . '(全场)';
+        $score_home_half = intval($resultModel->u_home_score);
+        $guest_home_half = intval($resultModel->u_guest_score);
+        $word_all_half = $score_home_half . '-' . $guest_home_half . '(半场)';
+
+
         if ($resulttod % 2 == 0) {
             $text = '双';
         } else {
@@ -448,12 +456,12 @@ class ZqRule
             } else {
                 $dsresult = -1;
             }
-            return ['result' => $dsresult, 'matchResult' => "$resulttod(全场)"];
+            return ['result' => $dsresult, 'matchResult' => $word_all];
         } elseif ($model->odds_code == 'half_two_sides_single' || $model->odds_code == 'half_two_sides_double') {
             $hafs = intval($resultModel->u_home_score) + intval($resultModel->u_guest_score);
             $text = ($hafs % 2 == 0) ? '双' : '单';
             $dsresult = ($text == $model->condition) ? 1 : -1;
-            return ['result' => $dsresult, 'matchResult' => "$hafs(半场)"];
+            return ['result' => $dsresult, 'matchResult' => $word_all_half];
         } else {
             $data = [
                 'result' => 100,
@@ -470,6 +478,13 @@ class ZqRule
         $resultModel = $resultModels['0'];
         //全场总进球数
         $resulttod = intval($resultModel->home_score) + intval($resultModel->guest_score);
+        $score_home = intval($resultModel->home_score);
+        $guest_home = intval($resultModel->guest_score);
+        $word_all = $score_home . '-' . $guest_home . '(全场)';
+        $score_home_half = intval($resultModel->u_home_score);
+        $guest_home_half = intval($resultModel->u_guest_score);
+        $word_all_half = $score_home_half . '-' . $guest_home_half . '(半场)';
+
         //上半场总进球数
         $firsthalftod = intval($resultModel->u_home_score) + intval($resultModel->u_guest_score);
         $results = 0;
@@ -534,25 +549,25 @@ class ZqRule
         if ($results == 1) {
             $data = [
                 'result' => 1,
-                'matchResult' => "$resulttod(全场)",
+                'matchResult' => $word_all,
             ];
         }
         if ($results == -1) {
             $data = [
                 'result' => -1,
-                'matchResult' => "$resulttod(全场)",
+                'matchResult' => $word_all,
             ];
         }
         if ($resultb == 1) {
             $data = [
                 'result' => 1,
-                'matchResult' => "$firsthalftod(半场)",
+                'matchResult' => $word_all_half,
             ];
         }
         if ($resultb == -1) {
             $data = [
                 'result' => -1,
-                'matchResult' => "$firsthalftod(半场)",
+                'matchResult' => $word_all_half,
             ];
         }
         return $data;
@@ -572,35 +587,35 @@ class ZqRule
 
         switch ($odds_code) {
             case 'home_tema_ball_big':
-                $returnDatas['matchResult'] = $score_home . '(全场)';
+                $returnDatas['matchResult'] = $score_home . '-' . $score_guest . '(全场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_home, $model->condition, 2, $returnDatas['matchResult']);
                 break;
             case 'home_tema_ball_small':
-                $returnDatas['matchResult'] = $score_home . '(全场)';
+                $returnDatas['matchResult'] = $score_home . '-' . $score_guest . '(全场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_home, $model->condition, 1, $returnDatas['matchResult']);
                 break;
             case 'guest_tema_ball_big':
-                $returnDatas['matchResult'] = $score_guest . '(全场)';
+                $returnDatas['matchResult'] = $score_home . '-' . $score_guest . '(全场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_guest, $model->condition, 2, $returnDatas['matchResult']);
                 break;
             case 'guest_tema_ball_small':
-                $returnDatas['matchResult'] = $score_guest . '(全场)';
+                $returnDatas['matchResult'] = $score_home . '-' . $score_guest . '(全场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_guest, $model->condition, 1, $returnDatas['matchResult']);
                 break;
             case 'half_home_tema_ball_big':
-                $returnDatas['matchResult'] = $score_home_uhalf . '(上全场)';
+                $returnDatas['matchResult'] = $score_home_uhalf . '-' . $score_guest_uhalf . '(上半场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_home_uhalf, $model->condition, 2, $returnDatas['matchResult']);
                 break;
             case 'half_home_tema_ball_small':
-                $returnDatas['matchResult'] = $score_home_uhalf . '(上全场)';
+                $returnDatas['matchResult'] = $score_home_uhalf . '-' . $score_guest_uhalf . '(上半场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_home_uhalf, $model->condition, 1, $returnDatas['matchResult']);
                 break;
             case 'half_guest_tema_ball_big':
-                $returnDatas['matchResult'] = $score_guest_uhalf . '(上半场)';
+                $returnDatas['matchResult'] = $score_home_uhalf . '-' . $score_guest_uhalf . '(上半场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_guest_uhalf, $model->condition, 2, $returnDatas['matchResult']);
                 break;
             case 'half_guest_tema_ball_small':
-                $returnDatas['matchResult'] = $score_guest_uhalf . '(上半场)';
+                $returnDatas['matchResult'] = $score_home_uhalf . '-' . $score_guest_uhalf . '(上半场)';
                 $returnDatas = $this->zq_inball_bigsmall($score_guest_uhalf, $model->condition, 1, $returnDatas['matchResult']);
                 break;
         }

app/Lib/Settlement/SettlementOrder.php

@@ -338,7 +338,7 @@ class SettlementOrder extends SettlementBase
             return;
         }
         $modelSMD = new SettlementMiddleDetailModel();
-        $hisData = $modelSMD->getSettledatas($game_code, $match_id, $bettype);
+        $hisData = $modelSMD->getSettledatas($game_code, $match_id, $bettype, $order_ids);
 
         if (count($hisData) <= 0) {
             return true;
@@ -397,7 +397,7 @@ class SettlementOrder extends SettlementBase
 
         if (isset($this->hissettlementDetail[$order_id])) {
             $ret = DB::table('settlement_middle_detail')
-                ->where(['game_code' => $game_code, 'match_id' => $match_id, 'bet_type' => $bet_type, 'order_id' => $order_id])
+                ->where(['game_code' => $game_code, 'bet_type' => $bet_type, 'order_id' => $order_id])
                 ->update(['money' => $money]);
         } else {
             $ret = DB::table('settlement_middle_detail')

app/Lib/Settlement/SettlementWinFail.php

@@ -356,7 +356,7 @@ class SettlementWinFail
         }
 
         $table = 'st_' . $game_code . '_competition';
-        $ret = DB::table($table)->where('match_id', $batch_id)->first();
+        $ret = DB::table($table)->where('id', $batch_id)->first();
         if (count($ret) <= 0) {
             throw new  \Exception('根据比赛ID获取赛事数据有误-'.$game_code.'-'.$batch_id);
         }

app/Models/SettlementMiddleDetail.php

@@ -6,14 +6,29 @@ class SettlementMiddleDetail extends BaseModel
     protected $table = "settlement_middle_detail";
     public $timestamps = false;
 
-    public function getSettledatas($gametype, $matchid, $bettype)
+    public function getSettledatas($gametype, $matchid, $bettype, $order_idsArr = [])
     {
         $ret = [];
-        $his = $this->where([
-            'game_code' => $gametype,
-            'match_id' => $matchid,
-            'bet_type' => $bettype
-        ])->get();
+        if (empty($order_idsArr)) {
+            $his = $this->where([
+                'game_code' => $gametype,
+                'match_id' => $matchid,
+                'bet_type' => $bettype
+            ])->get();
+        } else {
+            if ($bettype == 1) {
+                $his = $this->where([
+                    'game_code' => $gametype,
+                    'match_id' => $matchid,
+                    'bet_type' => $bettype
+                ])->whereIn('order_id', $order_idsArr)->get();
+            } else {
+                $his = $this->where([
+                    'game_code' => $gametype,
+                    'bet_type' => $bettype
+                ])->whereIn('order_id', $order_idsArr)->get();
+            }
+        }
 
         if (count($his) > 0) {
             foreach ($his as $val) {