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
9824d925
Commit
9824d925
authored
Aug 14, 2020
by
xuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
/user/infomation 接口封装数据返回 promotionCode 字段
parent
12775a91
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
2 deletions
+18
-2
AccountDto.java
...a/com/edgec/browserbackend/account/domain/AccountDto.java
+18
-2
No files found.
src/main/java/com/edgec/browserbackend/account/domain/AccountDto.java
View file @
9824d925
...
...
@@ -2,6 +2,7 @@ package com.edgec.browserbackend.account.domain;
import
com.edgec.browserbackend.browser.domain.IpSummary
;
import
com.edgec.browserbackend.browser.domain.ShopSummary
;
import
org.springframework.util.StringUtils
;
import
java.util.ArrayList
;
import
java.util.Date
;
...
...
@@ -47,11 +48,13 @@ public class AccountDto {
private
List
<
String
>
queryIpUrlList
;
private
String
promotionCode
;
private
Promotion
promotion
;
private
int
authorized
;
public
AccountDto
(){
public
AccountDto
()
{
}
...
...
@@ -67,8 +70,13 @@ public class AccountDto {
this
.
setPermission
(
account
.
getPermission
());
this
.
setWhiteList
(
account
.
getWhiteList
());
this
.
setQueryIpUrlList
(
account
.
getQueryIpUrlList
());
if
(
account
.
getPromotion
()
!=
null
)
if
(
account
.
getPromotion
()
!=
null
)
{
this
.
setPromotion
(
account
.
getPromotion
());
}
if
(!
StringUtils
.
isEmpty
(
account
.
getPromotionCode
()))
{
this
.
setPromotionCode
(
account
.
getPromotionCode
());
}
this
.
authorized
=
account
.
getAuthorized
();
}
...
...
@@ -240,4 +248,12 @@ public class AccountDto {
public
void
setAuthorized
(
int
authorized
)
{
this
.
authorized
=
authorized
;
}
public
String
getPromotionCode
()
{
return
promotionCode
;
}
public
void
setPromotionCode
(
String
promotionCode
)
{
this
.
promotionCode
=
promotionCode
;
}
}
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