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
ccee84de
Commit
ccee84de
authored
Dec 14, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除
parent
95f4b7e2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
Finance.php
application/index/controller/Finance.php
+1
-2
No files found.
application/index/controller/Finance.php
View file @
ccee84de
...
@@ -2770,7 +2770,6 @@ class Finance extends Basic
...
@@ -2770,7 +2770,6 @@ class Finance extends Basic
$pay_fields
=
'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,'
;
$pay_fields
=
'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,'
;
$pay_fields
.=
'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money'
;
$pay_fields
.=
'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money'
;
$pay_data
=
$m_pay
->
selectReceiptImgList
(
$pay_fields
,
[
'id'
=>
$this
->
params
[
'pay_id'
]]);
$pay_data
=
$m_pay
->
selectReceiptImgList
(
$pay_fields
,
[
'id'
=>
$this
->
params
[
'pay_id'
]]);
$pay_data
=
$this
->
numberTransitionString
(
$pay_data
);
$pay_data
=
$pay_data
[
0
];
$pay_data
=
$pay_data
[
0
];
//成交报告id
//成交报告id
if
(
empty
(
$pay_data
[
'order_id'
]))
{
if
(
empty
(
$pay_data
[
'order_id'
]))
{
...
@@ -2780,7 +2779,7 @@ class Finance extends Basic
...
@@ -2780,7 +2779,7 @@ class Finance extends Basic
}
else
{
}
else
{
$bargain_data
=
$this
->
m_bargain
->
getDetail
(
'id,price,is_open'
,
[
'order_id'
=>
$pay_data
[
'order_id'
]]);
$bargain_data
=
$this
->
m_bargain
->
getDetail
(
'id,price,is_open'
,
[
'order_id'
=>
$pay_data
[
'order_id'
]]);
$pay_data
[
'bargain_id'
]
=
empty
(
$bargain_data
)
?
""
:
$bargain_data
[
'id'
];
$pay_data
[
'bargain_id'
]
=
empty
(
$bargain_data
)
?
""
:
$bargain_data
[
'id'
];
$pay_data
[
'is_open'
]
=
$bargain_data
[
'is_open'
];
$pay_data
[
'is_open'
]
=
empty
(
$bargain_data
[
'is_open'
])
?
0
:
$bargain_data
[
'is_open'
];
$pay_data
[
'price'
]
=
$bargain_data
[
'price'
];
$pay_data
[
'price'
]
=
$bargain_data
[
'price'
];
$m_order
=
new
OrderModel
();
$m_order
=
new
OrderModel
();
...
...
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