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
d2f19601
Commit
d2f19601
authored
Aug 05, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add field
parent
d38d7e11
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
Finance.php
application/index/controller/Finance.php
+12
-2
No files found.
application/index/controller/Finance.php
View file @
d2f19601
...
@@ -3214,13 +3214,16 @@ class Finance extends Basic
...
@@ -3214,13 +3214,16 @@ class Finance extends Basic
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,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,'
;
$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
.=
'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name'
;
$field
.=
'a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,a.is_open,'
;
$field
.=
'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,'
;
$field
.=
'a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name'
;
$list
=
$order
->
getAddPayLogOrderListLimit
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$list
=
$order
->
getAddPayLogOrderListLimit
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$data
[
'total'
]
=
$order
->
getAddPayLogOrderListLimitTotal
(
$where
);
$data
[
'total'
]
=
$order
->
getAddPayLogOrderListLimitTotal
(
$where
);
$m_pay_adjustment
=
new
OPayLogAdjustment
();
$m_pay_adjustment
=
new
OPayLogAdjustment
();
$m_refund
=
new
ORefundModel
();
$m_refund
=
new
ORefundModel
();
$m_open
=
new
OPayLogOpen
();
foreach
(
$list
as
$k
=>
$v
)
{
foreach
(
$list
as
$k
=>
$v
)
{
$list
[
$k
][
'source_id'
]
=
$list
[
$k
][
'is_adjustment'
]
=
''
;
$list
[
$k
][
'source_id'
]
=
$list
[
$k
][
'is_adjustment'
]
=
''
;
if
(
$v
[
'source'
]
==
2
)
{
if
(
$v
[
'source'
]
==
2
)
{
...
@@ -3257,6 +3260,13 @@ class Finance extends Basic
...
@@ -3257,6 +3260,13 @@ class Finance extends Basic
$list
[
$k
][
'pay_type_num'
]
=
$v
[
'pay_type'
];
$list
[
$k
][
'pay_type_num'
]
=
$v
[
'pay_type'
];
$list
[
$k
][
'type_num'
]
=
$v
[
'type'
];
$list
[
$k
][
'type_num'
]
=
$v
[
'type'
];
if
(
empty
(
$v
[
'is_open'
]))
{
$is_check
=
$m_open
->
getFieldOneValue
(
'id'
,
[
'pay_log_id'
=>
$v
[
'id'
]]);
$list
[
$k
][
'is_check'
]
=
$is_check
>
0
?
1
:
0
;
}
else
{
$list
[
$k
][
'is_check'
]
=
0
;
}
}
}
$data
[
'list'
]
=
$list
;
$data
[
'list'
]
=
$list
;
...
...
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