Merge branch 'feature/fin' into develop
This commit is contained in:
@@ -64,10 +64,13 @@ class FinReceiptService
|
||||
}
|
||||
|
||||
// 没有付款记录的收款记录
|
||||
if (isset($p['payment_apply']) && $p['payment_apply'] == 'not') {
|
||||
if (isset($p['payment_apply']) && $p['payment_apply'] == 'not') { //未认领
|
||||
$config['where']['payment_apply_id'] = ['null'];
|
||||
} elseif (isset($p['payment_apply']) && $p['payment_apply'] == 'already') {
|
||||
} elseif (isset($p['payment_apply']) && $p['payment_apply'] == 'already') { //已认领
|
||||
$config['where']['payment_apply_id'] = ['not null'];
|
||||
} elseif (isset($p['payment_apply']) && $p['payment_apply'] == 'timeout') { //超时未认领
|
||||
$config['where']['payment_apply_id'] = ['not null'];
|
||||
$config['where']['created_at'] = ['<' ,time() - 24*60*60];
|
||||
}
|
||||
|
||||
// 收款申请筛选
|
||||
|
||||
Reference in New Issue
Block a user