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
826e7db3
Commit
826e7db3
authored
Dec 20, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order_id
parent
d721ca28
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
Finance.php
application/index/controller/Finance.php
+5
-2
OBargainModel.php
application/model/OBargainModel.php
+2
-2
No files found.
application/index/controller/Finance.php
View file @
826e7db3
...
@@ -2386,8 +2386,11 @@ class Finance extends Basic
...
@@ -2386,8 +2386,11 @@ class Finance extends Basic
}
}
if
(
!
empty
(
$this
->
params
[
'bargain_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'bargain_id'
]))
{
$order_id
=
$this
->
m_bargain
->
getFieldValue
(
'order_id'
,
$this
->
params
[
'bargain_id'
]);
$order_id
=
$this
->
m_bargain
->
getFieldValue
(
'order_id'
,
[
'id'
=>
$this
->
params
[
'bargain_id'
]]);
$where
[]
=
[
'EXP'
,
'a.id='
.
$order_id
];
if
(
!
empty
(
$order_id
))
{
$where
[]
=
[
'EXP'
,
'a.id='
.
$order_id
];
}
}
}
if
(
!
empty
(
$this
->
params
[
'pay_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'pay_id'
]))
{
...
...
application/model/OBargainModel.php
View file @
826e7db3
...
@@ -1593,7 +1593,7 @@ class OBargainModel extends Model
...
@@ -1593,7 +1593,7 @@ class OBargainModel extends Model
* @return mixed
* @return mixed
*/
*/
public
function
getFieldValue
(
$field
,
$where
)
{
public
function
getFieldValue
(
$field
,
$where
)
{
return
$this
->
where
(
$where
)
->
value
(
$field
);
return
$this
->
db_
->
where
(
$where
)
->
value
(
$field
);
}
}
/**
/**
...
@@ -1605,7 +1605,7 @@ class OBargainModel extends Model
...
@@ -1605,7 +1605,7 @@ class OBargainModel extends Model
* @throws \think\exception\DbException
* @throws \think\exception\DbException
*/
*/
public
function
getDetail
(
$field
,
$where
)
{
public
function
getDetail
(
$field
,
$where
)
{
return
$this
->
field
(
$field
)
return
$this
->
db_
->
field
(
$field
)
->
where
(
$where
)
->
where
(
$where
)
->
find
();
->
find
();
}
}
...
...
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