|
@@ -134,7 +134,6 @@ class HttpServerOnlySet
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$account_indent = $nowBuyDatasMainModel->account_identity;
|
|
$account_indent = $nowBuyDatasMainModel->account_identity;
|
|
|
- $batch_id = $nowBuyDatasMainModel->batch_id;
|
|
|
|
|
|
|
|
|
|
$paras = [
|
|
$paras = [
|
|
|
'type' => 'Settelement',
|
|
'type' => 'Settelement',
|
|
@@ -430,11 +429,9 @@ class HttpServerOnlySet
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- $batch_id = $simplexData->batch_id;
|
|
|
|
|
$matchModels = $matchDatas;
|
|
$matchModels = $matchDatas;
|
|
|
if (count($matchModels) <= 0) {
|
|
if (count($matchModels) <= 0) {
|
|
|
- throw new \Exception('match 数据异常-' . $batch_id, 106);
|
|
|
|
|
|
|
+ throw new \Exception('match 数据异常-' . $order_id, 106);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -454,7 +451,7 @@ class HttpServerOnlySet
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ($val->result == -1) {
|
|
if ($val->result == -1) {
|
|
|
- $this->PushSqlToArray("update money_buy_str set wait_match_num=0, prize_note=0, game_status=3, settle_status=2, gain_money=0,settlementtime='" . date('Y-m-d H:i:s') . "' where batch_id='$batch_id' ");
|
|
|
|
|
|
|
+ $this->PushSqlToArray("update money_buy_str set wait_match_num=0, prize_note=0, game_status=3, settle_status=2, gain_money=0,settlementtime='" . date('Y-m-d H:i:s') . "' where order_id='$order_id' ");
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
$in_array[] = ['odds' => $val->odds, 'winOrLose' => $val->result];
|
|
$in_array[] = ['odds' => $val->odds, 'winOrLose' => $val->result];
|
|
@@ -558,12 +555,9 @@ class HttpServerOnlySet
|
|
|
foreach ($ret as $val) {
|
|
foreach ($ret as $val) {
|
|
|
$this->PDatas['Money_buy_Orders_Array'][$val->order_id] = $val;
|
|
$this->PDatas['Money_buy_Orders_Array'][$val->order_id] = $val;
|
|
|
$orderarr[] = $val->order_id;
|
|
$orderarr[] = $val->order_id;
|
|
|
- $this->PDatas['Money_buy_Orders_batch_Array'][$val->batch_id][] = $val;
|
|
|
|
|
- $tmpbatchid[] = $val->batch_id;
|
|
|
|
|
$userindentys[] = $val->account_identity;
|
|
$userindentys[] = $val->account_identity;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //$tmpbatchid = array_unique($tmpbatchid);
|
|
|
|
|
$userindentys = array_unique($userindentys);
|
|
$userindentys = array_unique($userindentys);
|
|
|
|
|
|
|
|
if ($bettype == 1) {
|
|
if ($bettype == 1) {
|
|
@@ -587,7 +581,7 @@ class HttpServerOnlySet
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if ($settype == 2) {
|
|
if ($settype == 2) {
|
|
|
- $ret = DB::table('settlement_middle_detail')->where(['game_code' => $game_code, 'match_id' => $match_id])->whereIn('order_id', $order_ids)->get();
|
|
|
|
|
|
|
+ $ret = DB::table('settlement_middle_detail')->where(['game_code' => $game_code, 'match_id' => $match_id])->whereIn('order_id', explode(",", $order_ids))->get();
|
|
|
if ($ret) {
|
|
if ($ret) {
|
|
|
foreach ($ret as $val) {
|
|
foreach ($ret as $val) {
|
|
|
$this->PDatas['settlement_middle_detail_array'][$val->bet_type][$val->order_id] = $val;
|
|
$this->PDatas['settlement_middle_detail_array'][$val->bet_type][$val->order_id] = $val;
|