|
|
@@ -105,7 +105,7 @@ class UserBill extends BaseModel
|
|
|
if ($page) {
|
|
|
$list = self::where('uid', $uid)
|
|
|
->where('category', $category)
|
|
|
- ->field('mark,pm,number,add_time')
|
|
|
+ ->field('mark,pm,number,add_time,type')
|
|
|
->where('status', 1)
|
|
|
->order('add_time DESC')
|
|
|
->page((int)$page, (int)$limit)
|
|
|
@@ -113,7 +113,7 @@ class UserBill extends BaseModel
|
|
|
} else {
|
|
|
$list = self::where('uid', $uid)
|
|
|
->where('category', $category)
|
|
|
- ->field('mark,pm,number,add_time')
|
|
|
+ ->field('mark,pm,number,add_time,type')
|
|
|
->where('status', 1)
|
|
|
->order('add_time DESC')
|
|
|
->select();
|
|
|
@@ -132,7 +132,9 @@ class UserBill extends BaseModel
|
|
|
$data['zj'][] = $v;
|
|
|
}
|
|
|
if ($v['pm'] == 0){
|
|
|
- $data['zc'] += $v['number'];
|
|
|
+ if ($v['type'] != 'dec_anticipate'){
|
|
|
+ $data['zc'] += $v['number'];
|
|
|
+ }
|
|
|
$data['kc'][] = $v;
|
|
|
}
|
|
|
|
