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
ead73b33
Commit
ead73b33
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tkio导出报错
parent
84d191da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
ContractController.java
src/main/java/common/controller/ContractController.java
+1
-1
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+3
-1
No files found.
src/main/java/common/controller/ContractController.java
View file @
ead73b33
...
...
@@ -603,7 +603,7 @@ public class ContractController {
rowBody
.
createCell
(
8
).
setCellValue
(
df
.
format
(
contract
.
getMoney
()));
rowBody
.
createCell
(
9
).
setCellValue
(
contract
.
getTrackFlow
());
rowBody
.
createCell
(
10
).
setCellValue
(
contract
.
getUnitPrice
());
rowBody
.
createCell
(
11
).
setCellValue
(
contract
.
getClickFlow
());
rowBody
.
createCell
(
11
).
setCellValue
(
contract
.
getClickFlow
()
==
null
?
0.0
:
contract
.
getClickFlow
()
);
rowBody
.
createCell
(
12
).
setCellValue
(
df
.
format
(
contract
.
getIntervaIncomeShare
()
/
100.0
));
rowBody
.
createCell
(
13
).
setCellValue
(
df
.
format
(
contract
.
getAdjustmentFund
()
/
100.0
));
rowBody
.
createCell
(
14
).
setCellValue
(
df
.
format
(
contract
.
getIncomeShareAll
()
/
100.0
));
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
ead73b33
...
...
@@ -256,7 +256,9 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
if
(
clickFlow
!=
0
){
clickTenThousand
=
new
BigDecimal
(
clickFlow
/
10000.0
*
100
);
//区间点击数
contract
.
setClickFlow
(
new
BigDecimal
(
clickFlow
/
10000.0
).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
).
doubleValue
());
BigDecimal
clickNumReal
=
tkioFlowRepository
.
sumFlowByContractCodeAndDs
(
contract
.
getContractCode
(),
selected
[
0
].
toString
(
"yyyy-MM-dd"
),
usePart
[
1
].
toString
(
"yyyy-MM-dd"
));
int
clickNumRealFlow
=
clickNumReal
==
null
?
0
:
clickNumReal
.
intValue
();
contract
.
setClickFlow
(
new
BigDecimal
(
clickNumRealFlow
/
10000.0
).
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
).
doubleValue
());
}
//区间分摊收入
contract
.
setIntervaIncomeShare
(
unitPriceAccurate
.
multiply
(
clickTenThousand
).
setScale
(
0
,
BigDecimal
.
ROUND_HALF_UP
).
longValue
());
...
...
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