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
7e7c49b3
Commit
7e7c49b3
authored
Dec 26, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
字段修改
parent
5088377d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
Finance.php
application/index/controller/Finance.php
+2
-2
OPayLogModel.php
application/model/OPayLogModel.php
+1
-3
No files found.
application/index/controller/Finance.php
View file @
7e7c49b3
...
...
@@ -3503,8 +3503,8 @@ class Finance extends Basic
$where
[
'source'
]
=
2
;
$price
=
$m_pay
->
sumAdjustment
(
'b.money'
,
$where
,
$is_adjustment
);
}
else
{
$where
[
'
a.
type'
]
=
$type
;
$price
=
$m_pay
->
sumAdjustment
(
'
a.
money'
,
$where
,
$is_adjustment
);
$where
[
'type'
]
=
$type
;
$price
=
$m_pay
->
sumAdjustment
(
'
real_
money'
,
$where
,
$is_adjustment
);
}
return
empty
(
$price
)
?
''
:
$price
;
}
...
...
application/model/OPayLogModel.php
View file @
7e7c49b3
...
...
@@ -549,9 +549,7 @@ class OPayLogModel extends Model
->
where
(
$where
)
->
sum
(
$field
);
}
else
{
$field
=
$this
->
db_
->
alias
(
'a'
)
->
join
(
'o_paylog_adjustment b'
,
'a.id=b.new_paylog_id'
)
->
where
(
$where
)
$field
=
$this
->
db_
->
where
(
$where
)
->
sum
(
$field
);
}
...
...
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