Commit 9824d925 authored by xuxin's avatar xuxin

/user/infomation 接口封装数据返回 promotionCode 字段

parent 12775a91
...@@ -2,6 +2,7 @@ package com.edgec.browserbackend.account.domain; ...@@ -2,6 +2,7 @@ package com.edgec.browserbackend.account.domain;
import com.edgec.browserbackend.browser.domain.IpSummary; import com.edgec.browserbackend.browser.domain.IpSummary;
import com.edgec.browserbackend.browser.domain.ShopSummary; import com.edgec.browserbackend.browser.domain.ShopSummary;
import org.springframework.util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
...@@ -47,11 +48,13 @@ public class AccountDto { ...@@ -47,11 +48,13 @@ public class AccountDto {
private List<String> queryIpUrlList; private List<String> queryIpUrlList;
private String promotionCode;
private Promotion promotion; private Promotion promotion;
private int authorized; private int authorized;
public AccountDto(){ public AccountDto() {
} }
...@@ -67,8 +70,13 @@ public class AccountDto { ...@@ -67,8 +70,13 @@ public class AccountDto {
this.setPermission(account.getPermission()); this.setPermission(account.getPermission());
this.setWhiteList(account.getWhiteList()); this.setWhiteList(account.getWhiteList());
this.setQueryIpUrlList(account.getQueryIpUrlList()); this.setQueryIpUrlList(account.getQueryIpUrlList());
if (account.getPromotion() != null) if (account.getPromotion() != null) {
this.setPromotion(account.getPromotion()); this.setPromotion(account.getPromotion());
}
if (!StringUtils.isEmpty(account.getPromotionCode())) {
this.setPromotionCode(account.getPromotionCode());
}
this.authorized = account.getAuthorized(); this.authorized = account.getAuthorized();
} }
...@@ -240,4 +248,12 @@ public class AccountDto { ...@@ -240,4 +248,12 @@ public class AccountDto {
public void setAuthorized(int authorized) { public void setAuthorized(int authorized) {
this.authorized = authorized; this.authorized = authorized;
} }
public String getPromotionCode() {
return promotionCode;
}
public void setPromotionCode(String promotionCode) {
this.promotionCode = promotionCode;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment