|
@@ -83,10 +83,15 @@ class UserBill extends BaseModel
|
|
|
foreach ($list as &$v) {
|
|
|
$v['add_time'] = date('Y/m/d H:i', $v['add_time']);
|
|
|
$v['number'] = floatval($v['number']);
|
|
|
+
|
|
|
}
|
|
|
- return $list;
|
|
|
+ $lists['data'] = $list;
|
|
|
+ $lists['sr'] = self::where('uid', $uid)->where('category', $category)->where('status', 1)->where('pm', 1)->sum('number');
|
|
|
+ $lists['zc'] = self::where('uid', $uid)->where('category', $category)->where('status', 1)->where('pm', 0)->sum('number');
|
|
|
+ return $lists;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 获取昨日佣金
|
|
|
* @param $uid
|
|
@@ -175,7 +180,15 @@ class UserBill extends BaseModel
|
|
|
$value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
|
|
|
array_push($data, $value);
|
|
|
}
|
|
|
- return $data;
|
|
|
+ $lists['data'] = $data;
|
|
|
+ if ($type < 3){
|
|
|
+ $lists['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '<>', 'brokerage')->where('pm', 1)->sum('number') ?? 0;
|
|
|
+ $lists['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '<>', 'brokerage')->where('pm', 0)->sum('number') ?? 0;
|
|
|
+ }else {
|
|
|
+ $lists['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '=', 'brokerage')->where('pm', 1)->sum('number') ?? 0;
|
|
|
+ $lists['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '=', 'brokerage')->where('pm', 0)->sum('number') ?? 0;
|
|
|
+ }
|
|
|
+ return $lists;
|
|
|
}
|
|
|
|
|
|
/**
|