Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
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
reyun
manager
Commits
2cdd47e9
Commit
2cdd47e9
authored
3 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
计算确认收入
parent
d1b8f5ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
DmpIncomeServiceImpl.java
src/main/java/common/service/impl/DmpIncomeServiceImpl.java
+8
-3
No files found.
src/main/java/common/service/impl/DmpIncomeServiceImpl.java
View file @
2cdd47e9
...
...
@@ -623,6 +623,11 @@ public class DmpIncomeServiceImpl implements DmpIncomeService {
income
.
setCreateTime
(
new
Date
());
income
.
setInputDate
(
DateTime
.
now
().
toString
(
"yyyy-MM-dd"
));
income
.
setInputUser
(
user
.
getName
());
income
=
cacluConfirmIncome
(
income
);
return
pdIncomeRepository
.
save
(
income
);
}
private
PdIncome
cacluConfirmIncome
(
PdIncome
income
)
{
if
(
StringUtils
.
isEmpty
(
income
.
getAcceptanceAmount
()))
{
Long
rax
=
Long
.
parseLong
(
income
.
getTaxRate
().
replace
(
"%"
,
""
))
/
100
+
1
;
Long
confirmIncome
=
rax
*
Long
.
parseLong
(
income
.
getAcceptanceAmount
());
...
...
@@ -630,8 +635,7 @@ public class DmpIncomeServiceImpl implements DmpIncomeService {
}
else
{
income
.
setConfirmIncome
(
"0"
);
}
return
pdIncomeRepository
.
save
(
income
);
return
income
;
}
@Override
...
...
@@ -639,10 +643,11 @@ public class DmpIncomeServiceImpl implements DmpIncomeService {
PdIncome
item
=
pdIncomeRepository
.
findOne
(
income
.
getId
());
item
.
setModifyTime
(
new
Date
());
item
.
setAcceptanceAmount
(
income
.
getAcceptanceAmount
());
item
.
setConfirmIncome
(
income
.
getConfirmIncome
());
item
.
setConfirmIncome
(
cacluConfirmIncome
(
income
)
.
getConfirmIncome
());
item
.
setInputDate
(
income
.
getInputDate
());
item
.
setIncomeType
(
income
.
getIncomeType
());
item
.
setTaxRate
(
income
.
getTaxRate
());
//item = cacluConfirmIncome(income);
pdIncomeRepository
.
save
(
item
);
return
item
;
}
...
...
This diff is collapsed.
Click to expand it.
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