Commit ef4b0c35 by xugaojun

修改小程序配置字段

parent d1f5f523
...@@ -46,7 +46,7 @@ public class WelcomeMediaDTO implements Serializable { ...@@ -46,7 +46,7 @@ public class WelcomeMediaDTO implements Serializable {
/** /**
* 小程序id,仅类型为5小程序时需要传 * 小程序id,仅类型为5小程序时需要传
*/ */
private String miniProgramId; private String miniprogramSettingId;
public Long getWelcomeMediaId() { public Long getWelcomeMediaId() {
return welcomeMediaId; return welcomeMediaId;
...@@ -112,12 +112,12 @@ public class WelcomeMediaDTO implements Serializable { ...@@ -112,12 +112,12 @@ public class WelcomeMediaDTO implements Serializable {
this.mediaSize = mediaSize; this.mediaSize = mediaSize;
} }
public String getMiniProgramId() { public String getMiniprogramSettingId() {
return miniProgramId; return miniprogramSettingId;
} }
public void setMiniProgramId(String miniProgramId) { public void setMiniprogramSettingId(String miniprogramSettingId) {
this.miniProgramId = miniProgramId; this.miniprogramSettingId = miniprogramSettingId;
} }
@Override @Override
......
...@@ -43,7 +43,7 @@ public class WelcomeMediaBO { ...@@ -43,7 +43,7 @@ public class WelcomeMediaBO {
/** /**
* 小程序id,仅类型为5小程序时需要传 * 小程序id,仅类型为5小程序时需要传
*/ */
private String miniProgramId; private String miniprogramSettingId;
public Long getWelcomeMediaId() { public Long getWelcomeMediaId() {
return welcomeMediaId; return welcomeMediaId;
...@@ -109,12 +109,12 @@ public class WelcomeMediaBO { ...@@ -109,12 +109,12 @@ public class WelcomeMediaBO {
this.mediaSize = mediaSize; this.mediaSize = mediaSize;
} }
public String getMiniProgramId() { public String getMiniprogramSettingId() {
return miniProgramId; return miniprogramSettingId;
} }
public void setMiniProgramId(String miniProgramId) { public void setMiniprogramSettingId(String miniprogramSettingId) {
this.miniProgramId = miniProgramId; this.miniprogramSettingId = miniprogramSettingId;
} }
@Override @Override
......
...@@ -281,7 +281,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -281,7 +281,7 @@ public class WelcomeServiceImpl implements WelcomeService {
// 小程序 // 小程序
if (Objects.equals(WelcomeMediaTypeEnum.PROGRAM.getCode(), one.getMediaType())) { if (Objects.equals(WelcomeMediaTypeEnum.PROGRAM.getCode(), one.getMediaType())) {
// 小程序查询,直接根据id查询 // 小程序查询,直接根据id查询
TabMiniprogramSetting miniprogram = miniprogramSettingMapper.selectByPrimaryKey(one.getMiniProgramId()); TabMiniprogramSetting miniprogram = miniprogramSettingMapper.selectByPrimaryKey(one.getMiniprogramSettingId());
if (Objects.nonNull(miniprogram)) { if (Objects.nonNull(miniprogram)) {
one.setMediaTitle(miniprogram.getTitle()); one.setMediaTitle(miniprogram.getTitle());
one.setMiniProgramName(miniprogram.getMiniprogramName()); one.setMiniProgramName(miniprogram.getMiniprogramName());
...@@ -485,7 +485,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -485,7 +485,7 @@ public class WelcomeServiceImpl implements WelcomeService {
bo.setMediaType(one.getMediaType()); bo.setMediaType(one.getMediaType());
bo.setMediaUrl(one.getMediaUrl()); bo.setMediaUrl(one.getMediaUrl());
bo.setMediaSize(one.getMediaSize()); bo.setMediaSize(one.getMediaSize());
bo.setMiniProgramId(one.getMiniProgramId()); bo.setMiniprogramSettingId(one.getMiniProgramId());
return bo; return bo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
......
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