Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun
2021-03-25 17:27:01 +08:00
parent dffca92564 2a23b51612
commit 4fece27960
18 changed files with 226 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java
View File

@ -61,7 +61,7 @@ public interface SysIngredientMapper {
* @param ids 需要删除的数据ID
* @return 结果
*/
int deleteSysIngredientByIds(Long[] ids);
// int deleteSysIngredientByIds(Long[] ids);
int batchIngredientRec(List<SysIngredientRec> ingredientRecList);
@ -71,9 +71,9 @@ public interface SysIngredientMapper {
int deleteIngredientNotRecByIngredientId(Long notRecId);
int deleteIngredientRecByIngredientIds(Long[] id);
// int deleteIngredientRecByIngredientIds(Long[] id);
int deleteIngredientNotRecByIngredientIds(Long[] id);
// int deleteIngredientNotRecByIngredientIds(Long[] id);
/**
* 根据食材名称查询食材信息

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysDishesService.java
View File

@ -53,7 +53,7 @@ public interface ISysDishesService
* @param ids 需要删除的菜品ID
* @return 结果
*/
public int deleteSysDishesByIds(Long[] ids);
// public int deleteSysDishesByIds(Long[] ids);
/**
* 删除菜品信息

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysIngredientService.java
View File

@ -49,7 +49,7 @@ public interface ISysIngredientService
* @param ids 需要删除的食材ID
* @return 结果
*/
public int deleteSysIngredientByIds(Long[] ids);
// public int deleteSysIngredientByIds(Long[] ids);
/**
* 删除食材信息

12
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysDishesServiceImpl.java
View File

@ -107,11 +107,11 @@ public class SysDishesServiceImpl implements ISysDishesService {
* @param ids 需要删除的菜品ID
* @return 结果
*/
@Override
public int deleteSysDishesByIds(Long[] ids) {
sysDishesMapper.deleteIngredientByIds(ids);
return sysDishesMapper.deleteSysDishesByIds(ids);
}
// @Override
// public int deleteSysDishesByIds(Long[] ids) {
// sysDishesMapper.deleteIngredientByIds(ids);
// return sysDishesMapper.deleteSysDishesByIds(ids);
// }
/**
* 删除菜品信息
@ -121,7 +121,7 @@ public class SysDishesServiceImpl implements ISysDishesService {
*/
@Override
public int deleteSysDishesById(Long id) {
sysDishesMapper.deleteIngredientById(id);
// sysDishesMapper.deleteIngredientById(id);
return sysDishesMapper.deleteSysDishesById(id);
}

28
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java
View File

@ -169,18 +169,18 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
return sysIngredientMapper.updateSysIngredient(sysIngredient);
}
/**
* 批量删除食材
*
* @param ids 需要删除的食材ID
* @return 结果
*/
@Override
public int deleteSysIngredientByIds(Long[] ids) {
sysIngredientMapper.deleteIngredientRecByIngredientIds(ids);
sysIngredientMapper.deleteIngredientNotRecByIngredientIds(ids);
return sysIngredientMapper.deleteSysIngredientByIds(ids);
}
// /**
// * 批量删除食材
// *
// * @param ids 需要删除的食材ID
// * @return 结果
// */
// @Override
// public int deleteSysIngredientByIds(Long[] ids) {
// sysIngredientMapper.deleteIngredientRecByIngredientIds(ids);
// sysIngredientMapper.deleteIngredientNotRecByIngredientIds(ids);
// return sysIngredientMapper.deleteSysIngredientByIds(ids);
// }
/**
* 删除食材信息
@ -190,8 +190,8 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
*/
@Override
public int deleteSysIngredientById(Long id) {
sysIngredientMapper.deleteIngredientRecByIngredientId(id);
sysIngredientMapper.deleteIngredientNotRecByIngredientId(id);
// sysIngredientMapper.deleteIngredientRecByIngredientId(id);
// sysIngredientMapper.deleteIngredientNotRecByIngredientId(id);
return sysIngredientMapper.deleteSysIngredientById(id);
}