|
...
|
...
|
@@ -121,7 +121,21 @@ class User extends Api |
|
|
|
{
|
|
|
|
$user = $this->auth->getUser();
|
|
|
|
$house = House::get($user['house_id']);
|
|
|
|
$plus = UserMoneyLog::where('user_id',$this->auth->id)
|
|
|
|
// 计算今日收益
|
|
|
|
$plus_today = UserMoneyLog::where('user_id',$user['id'])
|
|
|
|
->where('money','>',0)
|
|
|
|
->whereTime('createtime', 'today')
|
|
|
|
->select();
|
|
|
|
$today_money = 0;
|
|
|
|
foreach ($plus_today as $v) {
|
|
|
|
if($v['before'] > $v['after']) {
|
|
|
|
$today_money -= $v['money'];
|
|
|
|
} else {
|
|
|
|
$today_money += $v['money'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 计算总收益
|
|
|
|
$plus = UserMoneyLog::where('user_id',$user['id'])
|
|
|
|
->where('money','>',0)
|
|
|
|
->select();
|
|
|
|
$total_money = 0;
|
|
...
|
...
|
@@ -136,10 +150,7 @@ class User extends Api |
|
|
|
// 当前小区信息
|
|
|
|
'house' => !empty($house) ? $house->visible(['id','name'])->toArray() : [],
|
|
|
|
// 今日收益
|
|
|
|
'today_money' => UserMoneyLog::where('user_id',$this->auth->id)
|
|
|
|
->where('money','>',0)
|
|
|
|
->whereTime('createtime', 'today')
|
|
|
|
->sum('money'),
|
|
|
|
'today_money' => $today_money,
|
|
|
|
// 总收益
|
|
|
|
'total_money' => $total_money,
|
|
|
|
// 未读消息数量
|
|
...
|
...
|
@@ -710,6 +721,8 @@ class User extends Api |
|
|
|
"data": [{
|
|
|
|
"memo": "测试", //标题
|
|
|
|
"money": "10.00", //金额
|
|
|
|
"before": 0, //变更前余额
|
|
|
|
"after": 0, //变更后余额
|
|
|
|
"status": 0, //状态:0=无状态,1=审核中,2=审核通过,3=审核失败
|
|
|
|
"createtime": "2020-08-29 17:07:56" // 时间
|
|
|
|
}]
|
|
...
|
...
|
@@ -722,7 +735,7 @@ class User extends Api |
|
|
|
$where = ['user_id'=>$this->auth->id];
|
|
|
|
$total_num = UserMoneyLog::where($where)->count();
|
|
|
|
$list = UserMoneyLog::where($where)
|
|
|
|
->field("memo,money,status,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
|
|
|
|
->field("memo,money,before,after,status,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
|
|
|
|
->page($page,$pageNum)
|
|
|
|
->order('createtime','DESC')
|
|
|
|
->select();
|
...
|
...
|
|
