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
af577ca7
Commit
af577ca7
authored
Jun 27, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bargain_id
parent
54db65fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
Finance.php
application/index/controller/Finance.php
+5
-4
OfficePayLog.php
application/index/controller/OfficePayLog.php
+5
-4
No files found.
application/index/controller/Finance.php
View file @
af577ca7
...
...
@@ -3025,10 +3025,11 @@ class Finance extends Basic
}
if
(
!
empty
(
$this
->
params
[
'bargain_id'
]))
{
$order_id
=
$this
->
m_bargain
->
getFieldValue
(
'order_id'
,
[
'id'
=>
$this
->
params
[
'bargain_id'
],
'father_id'
=>
0
]);
if
(
!
empty
(
$order_id
))
{
$where
[]
=
[
'EXP'
,
'a.order_id='
.
$order_id
];
}
// $order_id = $this->m_bargain->getFieldValue('order_id', ['id'=>$this->params['bargain_id'],'father_id'=>0]);
// if (!empty($order_id)) {
// $where[] = ['EXP', 'a.order_id='.$order_id];
// }
$where
[
'a.bargain_id'
]
=
$this
->
params
[
'bargain_id'
];
$is_show
=
1
;
}
...
...
application/index/controller/OfficePayLog.php
View file @
af577ca7
...
...
@@ -157,10 +157,11 @@ class OfficePayLog extends Basic
}
if
(
!
empty
(
$this
->
params
[
'bargain_id'
]))
{
$order_id
=
$this
->
m_bargain
->
getFieldValue
(
'order_id'
,
[
'id'
=>
$this
->
params
[
'bargain_id'
],
'father_id'
=>
0
]);
if
(
!
empty
(
$order_id
))
{
$where
[]
=
[
'EXP'
,
'a.order_id='
.
$order_id
];
}
// $order_id = $this->m_bargain->getFieldValue('order_id', ['id'=>$this->params['bargain_id'],'father_id'=>0]);
// if (!empty($order_id)) {
// $where[] = ['EXP', 'a.order_id='.$order_id];
// }
$where
[
'a.bargain_id'
]
=
$this
->
params
[
'bargain_id'
];
$is_show
=
1
;
}
...
...
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