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
76c1e08d
Commit
76c1e08d
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
e3e6b2b8
master
…
0727_bugfix
1990_bugfix
2578_bugfix
2580_fix
master_mv
mobvista_master
month_flow
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
9 deletions
+18
-9
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+18
-9
No files found.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
76c1e08d
...
...
@@ -211,6 +211,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
if
(
checkTwoTime
(
new
DateTime
(
v
.
getEndDate
()),
end
)||
checkTwoTime
(
start
,
new
DateTime
(
v
.
getEndDate
()))){
v
.
setIntervaIncomeShare
(
new
BigDecimal
(
v
.
getMoney
()/
1.06
*
100
).
setScale
(
0
,
BigDecimal
.
ROUND_HALF_UP
).
longValue
());
v
.
setIncomeGross
(
v
.
getIntervaIncomeShare
());
v
.
setIncomeShareAll
(
v
.
getIntervaIncomeShare
());
}
}
});
...
...
@@ -633,7 +634,10 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
}
else
{
Contract
contractMaster
=
contractsArray
[
i
];
if
(
contracts
.
contains
(
contractMaster
)){
String
endDate
=
contractMaster
.
getEndDate
();
contractMaster
.
setEndDate
(
contractMaster
.
getNextSignedDate
());
shareIncome4ContractTKIO
(
contractMaster
,
start
,
end
,
true
);
//到结束的前一天
contractMaster
.
setEndDate
(
endDate
);
}
}
}
...
...
@@ -666,24 +670,18 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
}
return
contractsArray
;
}
private
void
shareIncome4ContractTKIO
(
Contract
contract
,
DateTime
start
,
DateTime
end
,
Boolean
is
New
)
{
private
void
shareIncome4ContractTKIO
(
Contract
contract
,
DateTime
start
,
DateTime
end
,
Boolean
is
More
)
{
DateTime
[]
selected
=
new
DateTime
[]{
start
,
end
};
//用户筛选开始/结束日期
DateTime
[]
contractPart
=
null
;
if
(
isNew
){
contractPart
=
new
DateTime
[]{
new
DateTime
(
contract
.
getStartDate
()),
new
DateTime
(
StringUtil
.
isEmpty
(
contract
.
getNextSignedDate
())?
contract
.
getEndDate
():
contract
.
getNextSignedDate
())};
//合同开始结束 时间
}
else
{
contractPart
=
new
DateTime
[]{
DateTime
[]
contractPart
=
new
DateTime
[]{
new
DateTime
(
contract
.
getStartDate
()),
new
DateTime
(
contract
.
getEndDate
())};
//合同开始结束 时间
}
DateTime
[]
usePart
=
new
DateTime
[]{
selected
[
0
].
compareTo
(
contractPart
[
0
])
<=
0
?
contractPart
[
0
]
:
selected
[
0
],
selected
[
1
].
compareTo
(
contractPart
[
1
])
>=
0
?
contractPart
[
1
]
:
selected
[
1
]
};
usePart
[
0
]
=
usePart
[
0
].
compareTo
(
usePart
[
1
])
>=
0
?
usePart
[
1
]
:
usePart
[
0
];
Long
excludTax
=
new
BigDecimal
(
contract
.
getMoney
()
/
1.06
)
...
...
@@ -715,6 +713,17 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
if
(
suspendContract
!=
null
)
{
return
;
}
//补充协议的主合同特殊处理
if
(
isMore
&&
new
DateTime
(
contract
.
getNextSignedDate
()).
isBefore
(
selected
[
0
]))
{
contract
.
setIntervaIncomeShare
(
0L
);
contract
.
setAdjustmentFund
(
0L
);
contract
.
setIncomeShareAll
(
contract
.
getIntervaIncomeShare
());
contract
.
setClickFlow
(
0.0
);
contract
.
setIncomeGross
(
0L
);
return
;
}
//晚录合同处理//正常合同处理
DateTime
create
=
new
DateTime
(
new
DateTime
(
contract
.
getCreateTime
()).
toString
(
"yyyy-MM-dd"
));
//录入时间点
DateTime
[]
creatPoints
=
new
DateTime
[]{
...
...
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