Browse Source

喜相随商品

master
wangpengfei 2 years ago
parent
commit
f7a395bee8
  1. 8
      warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/restrictedbrand/RestrictedBrandRest.java
  2. 15
      warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/restrictedbrand/RestrictedBrandService.java

8
warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/restrictedbrand/RestrictedBrandRest.java

@ -87,13 +87,15 @@ public class RestrictedBrandRest{
} }
public ResultBean delBySid(String id) { @ApiOperation("删除")
@GetMapping("/delBySid/{sid}")
public ResultBean delBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
RestrictedBrand restrictedBrand = restrictedBrandService.getRestById(id); RestrictedBrand restrictedBrand = restrictedBrandService.getRestById(sid);
if(restrictedBrand == null){ if(restrictedBrand == null){
return rb.setMsg("该监管品牌不存在"); return rb.setMsg("该监管品牌不存在");
} }
restrictedBrandService.deleteById(id); restrictedBrandService.deleteById(sid);
return rb.success(); return rb.success();
} }

15
warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/restrictedbrand/RestrictedBrandService.java

@ -105,17 +105,18 @@ public class RestrictedBrandService extends MybatisBaseService<RestrictedBrandMa
BeanUtil.copyProperties(dto, restrictedBrand, "sid"); BeanUtil.copyProperties(dto, restrictedBrand, "sid");
baseMapper.insert(restrictedBrand); baseMapper.insert(restrictedBrand);
} else { } else {
RestrictedBrand restrictedBrand = fetchByCode(code); RestrictedBrand restrictedBrand = fetchBySid(sid);
if (restrictedBrand == null) { // if (restrictedBrand == null) {
return rb.setMsg("该品牌不存在"); // return rb.setMsg("该品牌不存在");
} // }
//查询是否存在code值相同的 //查询是否存在code值相同的
RestrictedBrand restrictedBrands = baseMapper.selectByCodeAndSid(code, sid); RestrictedBrand restrictedBrands = baseMapper.selectByCodeAndSid(code, sid);
if (restrictedBrands != null) { if (restrictedBrands != null) {
return rb.setMsg("该品牌编码已存在"); return rb.setMsg("该品牌编码已存在");
} }
BeanUtil.copyProperties(dto, restrictedBrand, "sid"); BeanUtil.copyProperties(dto, restrictedBrand, "sid");
baseMapper.updateById(restrictedBrand); // baseMapper.updateById(restrictedBrand);
baseMapper.update(restrictedBrand,new QueryWrapper<RestrictedBrand>().eq("sid",sid));
} }
return rb.success(); return rb.success();
@ -199,9 +200,9 @@ public class RestrictedBrandService extends MybatisBaseService<RestrictedBrandMa
return baseMapper.selectByBrands(brandCode); return baseMapper.selectByBrands(brandCode);
} }
public RestrictedBrand fetchByCode(String code) { public RestrictedBrand fetchBySid(String sid) {
QueryWrapper<RestrictedBrand> qw = new QueryWrapper<>(); QueryWrapper<RestrictedBrand> qw = new QueryWrapper<>();
qw.eq("code", code); qw.eq("sid", sid);
List<RestrictedBrand> list = baseMapper.selectList(qw); List<RestrictedBrand> list = baseMapper.selectList(qw);
if (list == null || list.isEmpty()) if (list == null || list.isEmpty())
return null; return null;

Loading…
Cancel
Save