|
|
@@ -175,7 +175,7 @@ class HttpServerSettelement
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- $match_datas = DB::table('money_buy_match')->where(['batch_id' => $orderInfo->batch_id, 'bet_type' => 1])->get();
|
|
|
+ $match_datas = DB::table('money_buy_match')->where(['order_id' => $orderid, 'bet_type' => 1])->get();
|
|
|
if (count($match_datas) <= 0) {
|
|
|
$data = Response::generate('', 10, $paras, 'match info empty');
|
|
|
$response->end($data);
|
|
|
@@ -351,7 +351,7 @@ class HttpServerSettelement
|
|
|
$change_status = isset($paras['change_status']) ? $paras['change_status'] : 0;
|
|
|
|
|
|
if (empty($paras['order_ids'])) {
|
|
|
- $idoarr = $this->getOrders($bettype, $game_code, $match_id);
|
|
|
+ $idoarr = $this->getOrders($bettype, $game_code, $match_id, $is_manaue);
|
|
|
} else {
|
|
|
$idoarr = explode(",", $paras['order_ids']);
|
|
|
}
|
|
|
@@ -383,14 +383,14 @@ class HttpServerSettelement
|
|
|
return $ret;
|
|
|
}
|
|
|
|
|
|
- private function getOrders($bet_type, $game_code, $match_id, $is_manual)
|
|
|
+ private function getOrders($bet_type, $game_code, $match_id, $is_manual = 0)
|
|
|
{
|
|
|
if ($bet_type == 1) {
|
|
|
$table = 'money_buy_simplex';
|
|
|
$ret = DB::table($table)->select('order_id')->where(['game_code' => $game_code, 'match_id' => $match_id, 'is_manual' => $is_manual])->get();
|
|
|
} else {
|
|
|
$table = 'money_buy_str';
|
|
|
- $ret = DB::table($table)->select('order_id')->whereRaw(" batch_id in ( select batch_id from money_buy_match where match_id=$match_id and game_code='$game_code' and bet_type=2 )")->get();
|
|
|
+ $ret = DB::table($table)->select('order_id')->whereRaw(" order_id in ( select order_id from money_buy_match where match_id=$match_id and game_code='$game_code' and bet_type=2 )")->get();
|
|
|
}
|
|
|
$return = [];
|
|
|
if ($ret) {
|