|
@@ -38,7 +38,11 @@ class JisuGameOrder extends Controller
|
|
|
$query = new JisuGameOrderModel();
|
|
$query = new JisuGameOrderModel();
|
|
|
|
|
|
|
|
$query = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
|
|
$query = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
|
|
|
- ->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id');
|
|
|
|
|
|
|
+ ->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
|
|
|
|
|
+ ->leftJoin('jisu_lottery', function($join) {
|
|
|
|
|
+ $join->on('jisu_game_order.type', '=', 'jisu_lottery.type')
|
|
|
|
|
+ ->on('jisu_game_order.issue', '=', 'jisu_lottery.issue');
|
|
|
|
|
+ });
|
|
|
if (!empty($params['id'])) {
|
|
if (!empty($params['id'])) {
|
|
|
$query = $query->where('jisu_game_order.id', $params['id']);
|
|
$query = $query->where('jisu_game_order.id', $params['id']);
|
|
|
}
|
|
}
|
|
@@ -59,14 +63,14 @@ class JisuGameOrder extends Controller
|
|
|
}
|
|
}
|
|
|
if (!empty($params['start_time'])) {
|
|
if (!empty($params['start_time'])) {
|
|
|
$startTime = $params['start_time'] . " 00:00:00";
|
|
$startTime = $params['start_time'] . " 00:00:00";
|
|
|
- $query = $query->where('sport_game_order.created_at', '>=', $startTime);
|
|
|
|
|
|
|
+ $query = $query->where('jisu_game_order.created_at', '>=', $startTime);
|
|
|
}
|
|
}
|
|
|
if (!empty($params['end_time'])) {
|
|
if (!empty($params['end_time'])) {
|
|
|
$endTime = $params['end_time'] . " 23:59:59";
|
|
$endTime = $params['end_time'] . " 23:59:59";
|
|
|
- $query = $query->where('sport_game_order.created_at', '<=', $endTime);
|
|
|
|
|
|
|
+ $query = $query->where('jisu_game_order.created_at', '<=', $endTime);
|
|
|
}
|
|
}
|
|
|
$count = $query->count();
|
|
$count = $query->count();
|
|
|
- $list = $query->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay','jisu_gameplay.number')
|
|
|
|
|
|
|
+ $list = $query->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay','jisu_gameplay.number','jisu_lottery.open_code','jisu_lottery.open_code_other')
|
|
|
->forPage($page, $limit)
|
|
->forPage($page, $limit)
|
|
|
->orderByDesc('jisu_game_order.created_at')
|
|
->orderByDesc('jisu_game_order.created_at')
|
|
|
->get();
|
|
->get();
|
|
@@ -87,8 +91,12 @@ class JisuGameOrder extends Controller
|
|
|
$id = request()->input('id');
|
|
$id = request()->input('id');
|
|
|
$order = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
|
|
$order = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
|
|
|
->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
|
|
->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
|
|
|
|
|
+ ->leftJoin('jisu_lottery', function($join) {
|
|
|
|
|
+ $join->on('jisu_game_order.type', '=', 'jisu_lottery.type')
|
|
|
|
|
+ ->on('jisu_game_order.issue', '=', 'jisu_lottery.issue');
|
|
|
|
|
+ })
|
|
|
->where('jisu_game_order.id', $id)
|
|
->where('jisu_game_order.id', $id)
|
|
|
- ->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay')
|
|
|
|
|
|
|
+ ->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay','jisu_lottery.open_code','jisu_lottery.open_code_other')
|
|
|
->first();
|
|
->first();
|
|
|
if (!$order) throw new Exception('订单不存在');
|
|
if (!$order) throw new Exception('订单不存在');
|
|
|
$order = $order->toArray();
|
|
$order = $order->toArray();
|
|
@@ -122,13 +130,13 @@ class JisuGameOrder extends Controller
|
|
|
|
|
|
|
|
// 获取用户余额
|
|
// 获取用户余额
|
|
|
$walletInfo = Wallet::where(['member_id' => $order->member_id])->first();
|
|
$walletInfo = Wallet::where(['member_id' => $order->member_id])->first();
|
|
|
- if (!$walletInfo) continue;
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
$before = $walletInfo->available_balance;
|
|
$before = $walletInfo->available_balance;
|
|
|
$after = bcsub($walletInfo->available_balance, $order->amount, 2);
|
|
$after = bcsub($walletInfo->available_balance, $order->amount, 2);
|
|
|
$walletInfo->available_balance = $after;
|
|
$walletInfo->available_balance = $after;
|
|
|
$walletInfo->save();
|
|
$walletInfo->save();
|
|
|
$remark = JisuGameplay::getRemark($order->type);
|
|
$remark = JisuGameplay::getRemark($order->type);
|
|
|
|
|
+
|
|
|
FundsRecord::addData([
|
|
FundsRecord::addData([
|
|
|
'change_type' => $remark.'退款',
|
|
'change_type' => $remark.'退款',
|
|
|
'amount' => $order->amount,
|
|
'amount' => $order->amount,
|