Commit 016835dd by songyinghui

feat: 欢迎语列表返回 欢迎语类型

parent 5565d586
...@@ -66,6 +66,8 @@ public class WelcomeListDTO implements Serializable { ...@@ -66,6 +66,8 @@ public class WelcomeListDTO implements Serializable {
*/ */
private List<WelcomeMediaDTO> welcomeMediaList; private List<WelcomeMediaDTO> welcomeMediaList;
private Integer type;
public String getModifierId() { public String getModifierId() {
return modifierId; return modifierId;
} }
...@@ -208,4 +210,12 @@ public class WelcomeListDTO implements Serializable { ...@@ -208,4 +210,12 @@ public class WelcomeListDTO implements Serializable {
", welcomeMediaList=" + welcomeMediaList + ", welcomeMediaList=" + welcomeMediaList +
'}'; '}';
} }
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
} }
...@@ -64,6 +64,8 @@ public class WelcomeListBO { ...@@ -64,6 +64,8 @@ public class WelcomeListBO {
private String modifierId ; private String modifierId ;
private String modifierName ; private String modifierName ;
private Integer type;
public String getCreatorId() { public String getCreatorId() {
return creatorId; return creatorId;
} }
...@@ -192,6 +194,14 @@ public class WelcomeListBO { ...@@ -192,6 +194,14 @@ public class WelcomeListBO {
this.defaultWelcomeFlag = defaultWelcomeFlag; this.defaultWelcomeFlag = defaultWelcomeFlag;
} }
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
@Override @Override
public String toString() { public String toString() {
return "WelcomeListBO{" + return "WelcomeListBO{" +
......
...@@ -239,6 +239,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -239,6 +239,7 @@ public class WelcomeServiceImpl implements WelcomeService {
bo.setOperatorId(one.getOperatorId()); bo.setOperatorId(one.getOperatorId());
bo.setOperatorName(one.getOperatorName()); bo.setOperatorName(one.getOperatorName());
bo.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag()); bo.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag());
bo.setType(one.getType());
// 媒体列表 // 媒体列表
bo.setWelcomeMediaList( bo.setWelcomeMediaList(
convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(one.getWelcomeId())) convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(one.getWelcomeId()))
......
...@@ -79,6 +79,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -79,6 +79,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
} }
@Override @Override
@Deprecated
public ServiceResponse<List<WelcomeListDTO>> listWelcome(String wxEnterpriseId, String title) { public ServiceResponse<List<WelcomeListDTO>> listWelcome(String wxEnterpriseId, String title) {
List<WelcomeListBO> welcomeList = welcomeService.listWelcome(wxEnterpriseId, title); List<WelcomeListBO> welcomeList = welcomeService.listWelcome(wxEnterpriseId, title);
// 数据转换 // 数据转换
...@@ -102,6 +103,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -102,6 +103,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
dto.setOperatorId(one.getOperatorId()); dto.setOperatorId(one.getOperatorId());
dto.setOperatorName(one.getOperatorName()); dto.setOperatorName(one.getOperatorName());
dto.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag()); dto.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag());
dto.setType(one.getType());
// 媒体列表 // 媒体列表
dto.setWelcomeMediaList( dto.setWelcomeMediaList(
CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList() CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList()
......
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