|
|
@ -33,8 +33,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper |
|
|
|
BaseBrandInfoQuery query = pq.getParams(); |
|
|
|
QueryWrapper<BaseBrandInfo> qw = new QueryWrapper<>(); |
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(query.getName())){ |
|
|
|
qw.like("brandName",query.getName()); |
|
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
|
qw.like("brandName", query.getName()); |
|
|
|
} |
|
|
|
IPage<BaseBrandInfo> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<BaseBrandInfoVo> pagging = baseMapper.listPage(page, qw); |
|
|
@ -50,11 +50,13 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper |
|
|
|
// }
|
|
|
|
return rb.success().setData(p); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<BaseBrandInfo>> listAll() { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1)); |
|
|
|
return rb.success().setData(pagging); |
|
|
|
} |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable", 1)); |
|
|
|
return rb.success().setData(pagging); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String sid = ""; |
|
|
@ -70,8 +72,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper |
|
|
|
wmsGoodsBrand.setModifyTime(new Date()); |
|
|
|
baseMapper.updateById(wmsGoodsBrand); |
|
|
|
} else { |
|
|
|
BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name",dto.getBrandName())); |
|
|
|
if(null!=goods){ |
|
|
|
BaseBrandInfo goods = baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name", dto.getBrandName())); |
|
|
|
if (null != goods) { |
|
|
|
return rb.setMsg("商品名不能重复"); |
|
|
|
} |
|
|
|
BaseBrandInfo wmsGoodsBrand = new BaseBrandInfo(); |
|
|
@ -105,7 +107,6 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public ResultBean delete(String sid) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BaseBrandInfo wmsGoodsBrand = fetchBySid(sid); |
|
|
@ -114,7 +115,8 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper |
|
|
|
} |
|
|
|
return rb.success().setMsg("成功"); |
|
|
|
} |
|
|
|
public ResultBean updateIsEnable(String sid,String isEnable) { |
|
|
|
|
|
|
|
public ResultBean updateIsEnable(String sid, String isEnable) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BaseBrandInfo wmsGoodsBrand = fetchBySid(sid); |
|
|
|
if (null != wmsGoodsBrand) { |
|
|
|