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
a1559e22
Commit
a1559e22
authored
Nov 04, 2020
by
lzxry
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
最后一天金额bugfix
parent
a96649e9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+2
-2
TrackingFlowTask.java
src/main/java/track/task/TrackingFlowTask.java
+2
-2
logback.xml
src/main/resources/logback/product/logback.xml
+3
-1
No files found.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
a1559e22
...
...
@@ -308,7 +308,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
lastDate
=
new
DateTime
[]{
contractPart
[
0
],
contractPart
[
1
].
plusDays
(-
1
)};
}
//合同除去最后一天的流量
BigDecimal
clickNum
=
tkioFlowRepository
.
sumFlowByContractCodeAndDs
(
contract
.
getContractCode
(),
lastDate
[
0
].
toString
(
"yyyy-MM-dd"
),
lastDate
[
1
].
plusDays
(-
1
).
toString
(
"yyyy-MM-dd"
));
BigDecimal
clickNum
=
tkioFlowRepository
.
sumFlowByContractCodeAndDs
(
contract
.
getContractCode
(),
lastDate
[
0
].
toString
(
"yyyy-MM-dd"
),
lastDate
[
1
].
toString
(
"yyyy-MM-dd"
));
int
clickFlow
=
clickNum
==
null
?
0
:
clickNum
.
intValue
();
BigDecimal
clickTenThousand
=
new
BigDecimal
(
0
);
if
(
clickFlow
!=
0
){
...
...
@@ -317,7 +317,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
long
beforeTheMoney
=
unitPriceAccurate
.
multiply
(
clickTenThousand
).
setScale
(
0
,
BigDecimal
.
ROUND_HALF_UP
).
longValue
();
//最后一天的流量
clickNum
=
tkioFlowRepository
.
sumFlowByContractCodeAndDs
(
contract
.
getContractCode
(),
contractPart
[
1
].
toString
(
"yyyy-MM-dd"
),
contractPart
[
1
].
plusDays
(-
1
).
toString
(
"yyyy-MM-dd"
));
clickNum
=
tkioFlowRepository
.
sumFlowByContractCodeAndDs
(
contract
.
getContractCode
(),
contractPart
[
1
].
toString
(
"yyyy-MM-dd"
),
contractPart
[
1
].
toString
(
"yyyy-MM-dd"
));
clickFlow
=
clickNum
==
null
?
0
:
clickNum
.
intValue
();
clickTenThousand
=
new
BigDecimal
(
0
);
if
(
clickFlow
!=
0
)
clickTenThousand
=
new
BigDecimal
(
clickFlow
/
10000.0
*
100
);
...
...
src/main/java/track/task/TrackingFlowTask.java
View file @
a1559e22
...
...
@@ -196,7 +196,8 @@ public class TrackingFlowTask {
List
<
String
>
emails
=
contractRepository
.
findDistinctEmailByPlatform
(
"tkio"
);
List
<
TkioFlow
>
tkioFlowList
=
new
ArrayList
<>();
String
yesterday
=
DateUtil
.
getBeforeDays
(
1
);
//昨日
logger
.
info
(
"昨日流量同步:"
+
yesterday
);
for
(
String
email
:
emails
)
{
//查询用户下所有appkey
...
...
@@ -211,7 +212,6 @@ public class TrackingFlowTask {
appkeyStr
=
"'"
+
appkeyStr
+
"'"
;
String
yesterday
=
DateUtil
.
getBeforeDays
(
1
);
//昨日
BigInteger
clickNum
=
accountFlowRestrictService
.
getTotalNum
(
yesterday
,
yesterday
,
appkeyStr
,
"account_track_flow_restrict"
,
"click_sum"
);
if
(
clickNum
!=
null
&&
clickNum
.
longValue
()>
0
){
List
<
Contract
>
contracts
=
contractRepository
.
findByPlatformAndEmail
(
"tkio"
,
email
);
...
...
src/main/resources/logback/product/logback.xml
View file @
a1559e22
...
...
@@ -18,7 +18,9 @@
<logger
name=
"org.springframework"
>
<level
value=
"warn"
/>
</logger>
<logger
name=
" org.apache.commons.httpclient"
>
<level
value=
"error"
/>
</logger>
<logger
name=
"org.hibernate"
>
<level
value=
"warn"
/>
</logger>
...
...
李引
@liyin
mentioned in commit
cba9c447
Nov 04, 2020
mentioned in commit
cba9c447
mentioned in commit cba9c4477aadb115732e1a983876ee4c0d9d4537
Toggle commit list
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