|
|
@@ -535,7 +535,7 @@ class MoneyBuy extends Model {
|
|
|
Render([], '2001', lang('Common','Api') -> get('user does login'));
|
|
|
}
|
|
|
// 用户ID
|
|
|
- $moneyBuyWhere['account_identity'] = $userInfo['identity'];
|
|
|
+ // $moneyBuyWhere['account_identity'] = $userInfo['identity'];
|
|
|
// 时间区间
|
|
|
$endTime = date('Y-m-d H:i:s');
|
|
|
if ($userInfo['statisticsTime']) {
|
|
|
@@ -543,16 +543,23 @@ class MoneyBuy extends Model {
|
|
|
} else {
|
|
|
$startTime = '1900-01-01 00:00:00';
|
|
|
}
|
|
|
- $moneyBuyBetween = [$startTime, $endTime];
|
|
|
+
|
|
|
+ // $moneyBuyBetween = [$startTime, $endTime];
|
|
|
$moneyRecordWhere['settle_status'] = 2;
|
|
|
+ $moneyBuyWhere = [
|
|
|
+ ['account_identity','=',$userInfo['identity']],
|
|
|
+ ['money_time','>',$startTime],
|
|
|
+ ['money_time','<',$endTime],
|
|
|
+ ];
|
|
|
// 获取单式投注订单
|
|
|
$moneyBuySimplex = lm('money_buy_simplex', "commons");
|
|
|
$mnyBuySpxData = $moneyBuySimplex
|
|
|
->select(['order_id', 'money', 'gain_money', 'batch_id'])
|
|
|
->where($moneyBuyWhere)
|
|
|
- ->whereBetween('settlementTime', $moneyBuyBetween)
|
|
|
+ // ->whereBetween('settlementTime', $moneyBuyBetween)
|
|
|
->get()
|
|
|
->toArray();
|
|
|
+
|
|
|
// 获取全部订单id
|
|
|
$moneyBuyMthOr = [];
|
|
|
$allBatchId = array_unique($mnyBuySpxData, SORT_REGULAR);
|
|
|
@@ -569,13 +576,12 @@ class MoneyBuy extends Model {
|
|
|
} else {
|
|
|
$getMoneyBuyMth = [];
|
|
|
}
|
|
|
-
|
|
|
// 获取串式投注订单
|
|
|
$moneyBuyStr = lm('money_buy_str', "commons");
|
|
|
$mnyBuyStrData = $moneyBuyStr
|
|
|
->select(['order_id', 'money', 'gain_money'])
|
|
|
->where($moneyBuyWhere)
|
|
|
- ->whereBetween('settlementTime', $moneyBuyBetween)
|
|
|
+ // ->whereBetween('settlementTime', $moneyBuyBetween)
|
|
|
->get();
|
|
|
$winMoney = $userInfo['allWin'];
|
|
|
$loseMoney = $userInfo['allLose'];
|