Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
1b358523
Commit
1b358523
authored
Aug 30, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款回收站
parent
f101ae94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
Finance.php
application/index/controller/Finance.php
+4
-0
PayLog.php
application/index/controller/PayLog.php
+3
-0
route.php
application/route.php
+2
-0
No files found.
application/index/controller/Finance.php
View file @
1b358523
...
@@ -3222,6 +3222,10 @@ class Finance extends Basic
...
@@ -3222,6 +3222,10 @@ class Finance extends Basic
$is_show
=
1
;
$is_show
=
1
;
}
}
if
(
!
empty
(
$this
->
params
[
'is_del'
]))
{
$where
[
'a.is_del'
]
=
1
;
}
try
{
try
{
$order
=
new
OPayLogModel
();
$order
=
new
OPayLogModel
();
$field
=
'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,'
;
$field
=
'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,'
;
...
...
application/index/controller/PayLog.php
View file @
1b358523
...
@@ -28,6 +28,7 @@ class PayLog extends Basic
...
@@ -28,6 +28,7 @@ class PayLog extends Basic
$where
[
'a.source'
]
=
[
'<'
,
2
];
$where
[
'a.source'
]
=
[
'<'
,
2
];
$msg
=
''
;
$msg
=
''
;
//转定时间
if
(
!
empty
(
$this
->
params
[
'transfer_start_time'
])
&&
!
empty
(
$this
->
params
[
'transfer_end_time'
]))
{
if
(
!
empty
(
$this
->
params
[
'transfer_start_time'
])
&&
!
empty
(
$this
->
params
[
'transfer_end_time'
]))
{
$where
[
'a.last_transfer_time'
]
=
[
'between'
,
[
$this
->
params
[
'transfer_start_time'
]
.
' 00:00:00'
,
$this
->
params
[
'transfer_end_time'
]
.
' 23:59:59'
]];
$where
[
'a.last_transfer_time'
]
=
[
'between'
,
[
$this
->
params
[
'transfer_start_time'
]
.
' 00:00:00'
,
$this
->
params
[
'transfer_end_time'
]
.
' 23:59:59'
]];
}
}
...
@@ -52,10 +53,12 @@ class PayLog extends Basic
...
@@ -52,10 +53,12 @@ class PayLog extends Basic
$where
[
'a.agent_id'
]
=
$this
->
params
[
'agent_id'
];
$where
[
'a.agent_id'
]
=
$this
->
params
[
'agent_id'
];
}
}
//成交报告id
if
(
!
empty
(
$this
->
params
[
'bargain_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'bargain_id'
]))
{
$where
[
'a.bargain_id'
]
=
$this
->
params
[
'bargain_id'
];
$where
[
'a.bargain_id'
]
=
$this
->
params
[
'bargain_id'
];
}
}
//收款id
if
(
!
empty
(
$this
->
params
[
'pay_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'pay_id'
]))
{
$where
[
'a.id'
]
=
$this
->
params
[
'pay_id'
];
$where
[
'a.id'
]
=
$this
->
params
[
'pay_id'
];
}
}
...
...
application/route.php
View file @
1b358523
...
@@ -273,6 +273,7 @@ Route::group('index', [
...
@@ -273,6 +273,7 @@ Route::group('index', [
'getTallAgeList'
=>
[
'index/Finance/getTallAgeList'
,
[
'method'
=>
'GET'
]],
//税费承担明细表
'getTallAgeList'
=>
[
'index/Finance/getTallAgeList'
,
[
'method'
=>
'GET'
]],
//税费承担明细表
'getCommissionTotalList'
=>
[
'index/Finance/getCommissionTotalList'
,
[
'method'
=>
'GET'
]],
//分佣提成汇总表
'getCommissionTotalList'
=>
[
'index/Finance/getCommissionTotalList'
,
[
'method'
=>
'GET'
]],
//分佣提成汇总表
'getCollection'
=>
[
'index/Finance/getCollection'
,
[
'method'
=>
'post|get'
]],
//收款记录
'getCollection'
=>
[
'index/Finance/getCollection'
,
[
'method'
=>
'post|get'
]],
//收款记录
'getCollectionDel'
=>
[
'index/Finance/getCollection'
,
[
'method'
=>
'post|get'
]],
//收款记录删除
'getCollectionDaily'
=>
[
'index/Finance/getCollection'
,
[
'method'
=>
'post|get'
]],
//收款记录(财务日报用)
'getCollectionDaily'
=>
[
'index/Finance/getCollection'
,
[
'method'
=>
'post|get'
]],
//收款记录(财务日报用)
'getCollectionExcel'
=>
[
'index/Finance/getCollectionExcel'
,
[
'method'
=>
'post|get'
]],
//收款记录
'getCollectionExcel'
=>
[
'index/Finance/getCollectionExcel'
,
[
'method'
=>
'post|get'
]],
//收款记录
'addRealMoney'
=>
[
'index/Finance/addRealMoney'
,
[
'method'
=>
'post|get'
]],
//新增实收
'addRealMoney'
=>
[
'index/Finance/addRealMoney'
,
[
'method'
=>
'post|get'
]],
//新增实收
...
@@ -1173,6 +1174,7 @@ Route::group('office_index', [
...
@@ -1173,6 +1174,7 @@ Route::group('office_index', [
'getRecords'
=>
[
'index/OfficeRoom/getRecords'
,
[
'method'
=>
'GET'
]],
//盘方操作记录
'getRecords'
=>
[
'index/OfficeRoom/getRecords'
,
[
'method'
=>
'GET'
]],
//盘方操作记录
'batchChangDish'
=>
[
'index/OfficeRoom/batchChangDish'
,
[
'method'
=>
'post'
]],
//批量修改盘方
'batchChangDish'
=>
[
'index/OfficeRoom/batchChangDish'
,
[
'method'
=>
'post'
]],
//批量修改盘方
'getCollection'
=>
[
'index/OfficePayLog/getCollection'
,
[
'method'
=>
'GET'
]],
//收款记录
'getCollection'
=>
[
'index/OfficePayLog/getCollection'
,
[
'method'
=>
'GET'
]],
//收款记录
'getCollectionDel'
=>
[
'index/OfficePayLog/getCollection'
,
[
'method'
=>
'GET'
]],
//收款记录
'getCollectionExcel'
=>
[
'index/OfficePayLog/getCollectionExcel'
,
[
'method'
=>
'get'
]],
//导出收款记录
'getCollectionExcel'
=>
[
'index/OfficePayLog/getCollectionExcel'
,
[
'method'
=>
'get'
]],
//导出收款记录
'adjustment'
=>
[
'index/OfficePayLog/adjustment'
,
[
'method'
=>
'get'
]],
//导出收款记录
'adjustment'
=>
[
'index/OfficePayLog/adjustment'
,
[
'method'
=>
'get'
]],
//导出收款记录
'getCollectionDetail'
=>
[
'index/OfficePayLog/getCollectionDetail'
,
[
'method'
=>
'get'
]],
//收款详情
'getCollectionDetail'
=>
[
'index/OfficePayLog/getCollectionDetail'
,
[
'method'
=>
'get'
]],
//收款详情
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment