|
@@ -61,14 +61,16 @@ class MoneyBuyStr extends BaseModel {
|
|
|
$water_return_money = \App\Models\Money_details::where('trade_id',$data[$i]->order_id)->where('trade_type','7')->first();
|
|
$water_return_money = \App\Models\Money_details::where('trade_id',$data[$i]->order_id)->where('trade_type','7')->first();
|
|
|
if(!empty($water_return_money)){
|
|
if(!empty($water_return_money)){
|
|
|
$data[$i]->water_return = $water_return_money->money;
|
|
$data[$i]->water_return = $water_return_money->money;
|
|
|
|
|
+ //用户投注后账户金额
|
|
|
|
|
+ $data[$i]->frozen_cash = $water_return_money->money_cash;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ //用户投注后账户金额
|
|
|
|
|
+ $data[$i]->frozen_cash = $data[$i]->money_cash;
|
|
|
}
|
|
}
|
|
|
$data[$i]->result = $data[$i]->water_return+$data[$i]->gain_money;
|
|
$data[$i]->result = $data[$i]->water_return+$data[$i]->gain_money;
|
|
|
|
|
|
|
|
$data[$i]->money_match_time = '投注:'.$data[$i]->money_time;
|
|
$data[$i]->money_match_time = '投注:'.$data[$i]->money_time;
|
|
|
-
|
|
|
|
|
- //用户投注后账户金额
|
|
|
|
|
- $data[$i]->frozen_cash = '';
|
|
|
|
|
- $data[$i]->frozen_cash = $water_return_money->money_cash;
|
|
|
|
|
|
|
+
|
|
|
//用户投注前账户金额
|
|
//用户投注前账户金额
|
|
|
$data[$i]->available_cash = $data[$i]->money_cash+$data[$i]->money;
|
|
$data[$i]->available_cash = $data[$i]->money_cash+$data[$i]->money;
|
|
|
$data[$i]->account = $data[$i]->available_cash.' <span>'.$data[$i]->account_name.' </span> '.$data[$i]->frozen_cash;
|
|
$data[$i]->account = $data[$i]->available_cash.' <span>'.$data[$i]->account_name.' </span> '.$data[$i]->frozen_cash;
|