abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商户

Browse Source
This commit is contained in:
kino 2021-01-19 10:39:33 +08:00
parent 6359692ea0
commit d5c30399e2
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java
View File

@ -51,8 +51,8 @@ public class AppMerchantController extends BaseController {
{
startPage();
LambdaQueryWrapper<AppMerchant> lqw = Wrappers.lambdaQuery(appMerchant);
if (StringUtils.isNotBlank(appMerchant.getName())){
lqw.like(AppMerchant::getName ,appMerchant.getName());
if (StringUtils.isNotBlank(appMerchant.getMchName())){
lqw.like(AppMerchant::getMchName ,appMerchant.getMchName());
}
if (StringUtils.isNotBlank(appMerchant.getSubtitle())){
lqw.eq(AppMerchant::getSubtitle ,appMerchant.getSubtitle());
@ -60,8 +60,8 @@ public class AppMerchantController extends BaseController {
if (StringUtils.isNotBlank(appMerchant.getAvatar())){
lqw.eq(AppMerchant::getAvatar ,appMerchant.getAvatar());
}
if (StringUtils.isNotBlank(appMerchant.getDesc())){
lqw.eq(AppMerchant::getDesc ,appMerchant.getDesc());
if (StringUtils.isNotBlank(appMerchant.getMchDesc())){
lqw.eq(AppMerchant::getMchDesc ,appMerchant.getMchDesc());
}
List<AppMerchant> list = iAppMerchantService.list(lqw);
return getDataTable(list);
@ -96,10 +96,10 @@ public class AppMerchantController extends BaseController {
@Log(title = "商户" , businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppMerchant appMerchant) {
String richText = appMerchant.getDesc();
String richText = appMerchant.getMchDesc();
if (richText != null && StringUtils.isNotEmpty(richText)) {
Document doc = RichTextUtil.setImgStyle(richText, "width: 100%");
appMerchant.setDesc(doc.body().children().toString());
appMerchant.setMchDesc(doc.body().children().toString());
}
return toAjax(iAppMerchantService.save(appMerchant) ? 1 : 0);
}
@ -111,10 +111,10 @@ public class AppMerchantController extends BaseController {
@Log(title = "商户" , businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppMerchant appMerchant) {
String richText = appMerchant.getDesc();
String richText = appMerchant.getMchDesc();
if (richText != null && StringUtils.isNotEmpty(richText)) {
Document doc = RichTextUtil.setImgStyle(richText, "width: 100%");
appMerchant.setDesc(doc.body().children().toString());
appMerchant.setMchDesc(doc.body().children().toString());
}
return toAjax(iAppMerchantService.updateById(appMerchant) ? 1 : 0);
}

4
hope-winery/src/main/java/com/ruoyi/winery/domain/AppMerchant.java
View File

@ -38,7 +38,7 @@ private static final long serialVersionUID=1L;
/** 商户名称 */
@Excel(name = "商户名称")
private String name;
private String mchName;
/** 副标题 */
@Excel(name = "副标题")
@ -50,7 +50,7 @@ private static final long serialVersionUID=1L;
/** 介绍 */
@Excel(name = "介绍")
private String desc;
private String mchDesc;
/** 创建者 */
private String createBy;

6
hope-winery/src/main/resources/mapper/winery/AppMerchantMapper.xml
View File

@ -6,11 +6,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="AppMerchant" id="AppMerchantResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="mchName" column="mch_name" />
<result property="subtitle" column="subtitle" />
<result property="avatar" column="avatar" />
<result property="desc" column="desc" />
<result property="mchDesc" column="mch_desc" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>