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

合并主分支内容

Browse Source
This commit is contained in:
xiezhijun
2021-03-03 16:19:02 +08:00
parent 97deafb62d cc629ac18f
commit 4943af635f
28 changed files with 541 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,4 +79,6 @@ public interface ISysOrderPauseService
* @return
*/
List<SysOrderPause> getPauseListByOrderId(Long orderId);
long selectNearMainOrderIdByCusId(Long cusId);
}

5
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java
View File

@ -149,4 +149,9 @@ public class SysOrderPauseServiceImpl implements ISysOrderPauseService
public List<SysOrderPause> getPauseListByOrderId(Long orderId){
return sysOrderPauseMapper.getPauseListByOrderId(orderId);
}
@Override
public long selectNearMainOrderIdByCusId(Long cusId) {
return sysOrderPauseMapper.selectNearMainOrderIdByCusId(cusId);
}
}

11
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java
View File

@ -41,6 +41,7 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService
sysRecipesPlan.setStartNumDay(1);
sysRecipesPlan.setEndNumDay(7);
sysRecipesPlan.setType(1);
sysRecipesPlan.setCusId(0L);
sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan);
if (!StringUtils.isNull(sysRecipesPlan.getId())) {
sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername());
@ -60,7 +61,15 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService
@Override
public int removeRecipesTemplate(Long id) {
return sysRecipesTemplateMapper.removeRecipesTemplate(id);
SysRecipesTemplate sysRecipesTemplate= sysRecipesTemplateMapper.getRecipesTemplateById(id);
if(StringUtils.isNull(sysRecipesTemplate)) {
return 0;
}
int rows = sysRecipesTemplateMapper.removeRecipesTemplate(sysRecipesTemplate.getId());
if(rows > 0) {
return sysRecipesPlanMapper.deleteSysRecipesPlanById(sysRecipesTemplate.getPlanId());
}
return 0;
}
@Override