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
6e319937
Commit
6e319937
authored
5 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复不含税收入
parent
293a1d2c
master
…
0727_bugfix
1315_bugfix
1439_bugfix
1608_bugfix
1608_from_1619
1619_bugfix
1990_bugfix
2578_bugfix
2580_fix
bigfix_20201028
bugfix_1608_new
bugfix_1760
bugfix_master_1760
change_double
liushaowei
master_mv
mobvista_master
month_flow
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
3 deletions
+14
-3
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+14
-3
No files found.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
6e319937
...
@@ -120,7 +120,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
...
@@ -120,7 +120,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
contract
.
setIntervalUseDays
(
getDayRange
(
contractPart
[
0
],
usePart
[
1
])
+
1
);
contract
.
setIntervalUseDays
(
getDayRange
(
contractPart
[
0
],
usePart
[
1
])
+
1
);
Long
excludTax
=
contract
.
getMoney
()
*
94
;
//不含税收入*100
Long
excludTax
=
new
BigDecimal
(
contract
.
getMoney
()
/
1.06
)
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
).
multiply
(
new
BigDecimal
(
100L
)).
longValue
();
//不含税收入*100
contract
.
setIncomeExcludingTax
(
excludTax
);
contract
.
setIncomeExcludingTax
(
excludTax
);
int
contractAllDay
=
getDayRange
(
contractPart
[
0
],
contractPart
[
1
])
+
1
;
//合同总天数
int
contractAllDay
=
getDayRange
(
contractPart
[
0
],
contractPart
[
1
])
+
1
;
//合同总天数
...
@@ -533,6 +534,18 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
...
@@ -533,6 +534,18 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
Long
aa
=
new
BigDecimal
(
1000
*
100
/
1.06
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
).
longValue
();
Long
bb
=
new
BigDecimal
(
1000
/
1.06
)
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
)
.
multiply
(
new
BigDecimal
(
100L
)).
longValue
();
System
.
out
.
println
(
aa
);
System
.
out
.
println
(
bb
);
}
public
static
void
main2
(
String
[]
args
)
{
DateTime
contractStart
=
new
DateTime
(
"2020-05-15"
);
DateTime
contractStart
=
new
DateTime
(
"2020-05-15"
);
DateTime
create
=
new
DateTime
(
"2020-06-15"
);
DateTime
create
=
new
DateTime
(
"2020-06-15"
);
System
.
out
.
println
(
contractStart
.
monthOfYear
().
getDateTime
());
System
.
out
.
println
(
contractStart
.
monthOfYear
().
getDateTime
());
...
@@ -548,8 +561,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
...
@@ -548,8 +561,6 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
{
new
DateTime
(),
new
DateTime
()},
{
new
DateTime
(),
new
DateTime
()},
{
new
DateTime
(),
new
DateTime
()}
{
new
DateTime
(),
new
DateTime
()}
};
};
System
.
out
.
println
(
times
[
1
][
0
].
toString
());
System
.
out
.
println
(
times
[
1
][
0
].
toString
());
}
}
}
}
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