Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
browser-backend
Project
Project
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
Administrator
browser-backend
Commits
2301d3f9
Commit
2301d3f9
authored
Sep 29, 2020
by
xuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
管理员界面-推广码下线查询 bug修復
parent
93583854
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
PromotionInfoDto.java
...om/edgec/browserbackend/account/dto/PromotionInfoDto.java
+10
-0
AdministratorServiceImpl.java
...ackend/account/service/impl/AdministratorServiceImpl.java
+1
-1
No files found.
src/main/java/com/edgec/browserbackend/account/dto/PromotionInfoDto.java
View file @
2301d3f9
...
@@ -21,6 +21,16 @@ public class PromotionInfoDto {
...
@@ -21,6 +21,16 @@ public class PromotionInfoDto {
private
Integer
secondLevelCommission
;
private
Integer
secondLevelCommission
;
public
PromotionInfoDto
(
Integer
firstLevelInvitedUsers
,
Integer
firstLevelIps
,
Integer
secondLevelIps
,
Integer
allLevelIps
,
Double
gift
,
Integer
firstLevelCommission
,
Integer
secondLevelCommission
)
{
this
.
firstLevelInvitedUsers
=
firstLevelInvitedUsers
;
this
.
firstLevelIps
=
firstLevelIps
;
this
.
secondLevelIps
=
secondLevelIps
;
this
.
allLevelIps
=
allLevelIps
;
this
.
gift
=
gift
;
this
.
firstLevelCommission
=
firstLevelCommission
;
this
.
secondLevelCommission
=
secondLevelCommission
;
}
public
Integer
getFirstLevelInvitedUsers
()
{
public
Integer
getFirstLevelInvitedUsers
()
{
return
firstLevelInvitedUsers
;
return
firstLevelInvitedUsers
;
}
}
...
...
src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java
View file @
2301d3f9
...
@@ -518,7 +518,7 @@ public class AdministratorServiceImpl implements AdministratorService {
...
@@ -518,7 +518,7 @@ public class AdministratorServiceImpl implements AdministratorService {
List
<
Account
>
accounts
=
accountRepository
.
findAllByPromotionCodeAndParentIsNull
(
account
.
getPromotion
().
getCode
());
List
<
Account
>
accounts
=
accountRepository
.
findAllByPromotionCodeAndParentIsNull
(
account
.
getPromotion
().
getCode
());
// promotion 用来存储所有用户的消费信息
// promotion 用来存储所有用户的消费信息
PromotionInfoDto
promotionInfoDto
=
new
PromotionInfoDto
();
PromotionInfoDto
promotionInfoDto
=
new
PromotionInfoDto
(
0
,
0
,
0
,
0
,
0.0
,
0
,
0
);
try
{
try
{
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
Date
beginTime
=
formatter
.
parse
(
beginDate
);
Date
beginTime
=
formatter
.
parse
(
beginDate
);
...
...
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