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
63cf5fa6
Commit
63cf5fa6
authored
4 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复不含税收入
parent
b659d615
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+2
-0
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+1
-1
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
63cf5fa6
...
...
@@ -1321,6 +1321,7 @@ public class ContractServiceImpl implements ContractService {
for
(
Contract
c
:
contractList
)
{
c
.
setMyBodyName
(
bodyMap
.
get
(
c
.
getMyBodyCode
()));
c
.
setTradeName
(
tradeTypeMap
.
get
(
c
.
getTradeType
()
+
""
));
c
.
setDs
(
new
DateTime
(
c
.
getCreateTime
()).
toString
(
"yyyy-MM-dd"
));
if
((
c
.
getExtraFlow
()
!=
null
&&
c
.
getExtraFlow
()
>
0
)
||
(
c
.
getDiscountTimeLong
()
!=
null
&&
c
.
getDiscountTimeLong
()
>
0
))
{
...
...
@@ -1340,6 +1341,7 @@ public class ContractServiceImpl implements ContractService {
}
// if (c.getType().equals(ContractTypeEnum.MAIN.getKey()) && platform.contains("io")) {
//
// } else if (c.getType().equals(ContractTypeEnum.MAIN.getKey())) {
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
63cf5fa6
...
...
@@ -126,7 +126,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
int
contractAllDay
=
getDayRange
(
contractPart
[
0
],
contractPart
[
1
])
+
1
;
//合同总天数
//处理精度
Long
dayShareIncome
=
new
BigDecimal
(
excludTax
/
contractAllDay
)
Long
dayShareIncome
=
new
BigDecimal
(
excludTax
*
1.0
/
contractAllDay
)
.
setScale
(
0
,
BigDecimal
.
ROUND_HALF_UP
).
longValue
();
//每日分摊收入(值扩大100倍)
//作废合同处理
...
...
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