Commit b2eb9773 by 墨竹

Merge branch 'feature/login-token' into developer

parents bd40e37e 6cd82673
......@@ -35,6 +35,11 @@ public class WelcomeDTO implements Serializable {
private String welcomeContent;
/**
* 图片
*/
private String welcomeImg;
/**
* 0删除 1正常
*/
private Integer openFlag;
......@@ -116,4 +121,12 @@ public class WelcomeDTO implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getWelcomeImg() {
return welcomeImg;
}
public void setWelcomeImg(String welcomeImg) {
this.welcomeImg = welcomeImg;
}
}
\ No newline at end of file
......@@ -33,7 +33,12 @@ public class TabWelcome implements Serializable {
private String welcomeContent;
/**
* 0删除 1正常
* 图片
*/
private String welcomeImg;
/**
* 0关闭 1开启
*/
private Integer openFlag;
......@@ -115,4 +120,12 @@ public class TabWelcome implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getWelcomeImg() {
return welcomeImg;
}
public void setWelcomeImg(String welcomeImg) {
this.welcomeImg = welcomeImg;
}
}
\ No newline at end of file
......@@ -234,6 +234,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
tabWelcome = new TabWelcome();
tabWelcome.setTitle(dto.getTitle());
tabWelcome.setWelcomeContent(dto.getWelcomeContent());
tabWelcome.setWelcomeImg(dto.getWelcomeImg());
tabWelcome.setCreateTime(new Date());
tabWelcome.setUpdateTime(new Date());
tabWelcome.setStatusFlag(1);
......@@ -244,6 +245,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
} else {
tabWelcome.setTitle(dto.getTitle());
tabWelcome.setWelcomeContent(dto.getWelcomeContent());
tabWelcome.setWelcomeImg(dto.getWelcomeImg());
tabWelcome.setUpdateTime(new Date());
tabWelcome.setOpenFlag(dto.getOpenFlag());
welcomeMapper.updateByPrimaryKeySelective(tabWelcome);
......
......@@ -6,6 +6,7 @@
<result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
<result column="title" jdbcType="VARCHAR" property="title"/>
<result column="welcome_content" jdbcType="VARCHAR" property="welcomeContent"/>
<result column="welcome_img" jdbcType="VARCHAR" property="welcomeImg"/>
<result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
<result column="open_flag" jdbcType="INTEGER" property="openFlag"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
......@@ -13,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
welcome_id, wx_enterprise_id, title, welcome_content,open_flag, status_flag, create_time, update_time
welcome_id, wx_enterprise_id, title, welcome_content,welcome_img,open_flag, status_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
......@@ -31,10 +32,10 @@
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title,
welcome_content, open_flag, status_flag, create_time,
welcome_content, welcome_img, open_flag, status_flag, create_time,
update_time)
values (#{welcomeId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR},
#{welcomeContent,jdbcType=VARCHAR}, #{openFlag},
#{welcomeContent,jdbcType=VARCHAR}, #{welcomeImg}, #{openFlag},
#{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
......@@ -51,6 +52,9 @@
<if test="welcomeContent != null">
welcome_content = #{welcomeContent,jdbcType=VARCHAR},
</if>
<if test="welcomeImg != null">
welcome_img = #{welcomeImg,jdbcType=VARCHAR},
</if>
<if test="openFlag != null">
open_flag = #{openFlag,jdbcType=INTEGER},
</if>
......
......@@ -651,7 +651,7 @@ public class WxEnterpriseController extends WebBaseController {
}
/**
* 绑定小程序配置列表
* 保存小程序配置列表
*
* @return
*/
......@@ -675,7 +675,7 @@ public class WxEnterpriseController extends WebBaseController {
}
/**
* 绑定小程序配置列表
* 获取小程序配置
*
* @return
*/
......@@ -692,7 +692,7 @@ public class WxEnterpriseController extends WebBaseController {
}
/**
* 绑定小程序配置列表
* 删除小程序配置
*
* @return
*/
......@@ -745,13 +745,13 @@ public class WxEnterpriseController extends WebBaseController {
}
/**
* 绑定小程序配置列表
* 保存欢迎语
*
* @return
*/
@IgnoreLogin
@RequestMapping("save-welcome")
public HaobanResponse savewelcome(String title, String welcomeContent) {
public HaobanResponse savewelcome(String title, String welcomeContent, String welcomeImg) {
LoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
if (StringUtils.isAnyBlank(title, welcomeContent)) {
......@@ -760,13 +760,14 @@ public class WxEnterpriseController extends WebBaseController {
WelcomeDTO welcomeDTO = new WelcomeDTO();
welcomeDTO.setTitle(title);
welcomeDTO.setWelcomeContent(welcomeContent);
welcomeDTO.setWelcomeImg(welcomeImg);
welcomeDTO.setWxEnterpriseId(wxEnterpriseId);
wxEnterpriseApiService.saveWelcome(welcomeDTO);
return resultResponse(HaoBanErrCode.ERR_1);
}
/**
* 绑定小程序配置列表
* 欢迎语列表
*
* @return
*/
......@@ -780,7 +781,7 @@ public class WxEnterpriseController extends WebBaseController {
}
/**
* 绑定小程序配置列表
* 删除欢迎语
*
* @return
*/
......@@ -794,7 +795,7 @@ public class WxEnterpriseController extends WebBaseController {
}
/**
* 绑定小程序配置列表
* 欢迎语开启关闭
*
* @return
*/
......
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