zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自动解绑

Browse Source
This commit is contained in:
qjq
2024-04-08 16:15:10 +08:00
parent 2b82f39a91
commit d58a6d0f16
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
View File

@ -6,11 +6,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.*;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.exception.ServerException; import cn.iocoder.yudao.framework.common.exception.ServerException;
@ -557,7 +553,7 @@ public class MemberUserServiceImpl implements MemberUserService {
Map<String, String> build = MapUtil.builder(new HashMap<String, String>()).build(); Map<String, String> build = MapUtil.builder(new HashMap<String, String>()).build();
if(sum<=5000){ if(sum<=5000){
build.put("prompt","您本周摄入的热量不达标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃肉类、水果以及根茎类的蔬菜。以上建议不成为医疗建议"); build.put("prompt","您本周摄入的热量不达标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃肉类、水果以及根茎类的蔬菜。以上建议不成为医疗建议");
}else if(sum>=10000){ }else if(sum<10000){
build.put("prompt","您本周摄入的热量达标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃谷类、水果以及根茎类的蔬菜。以上建议不成为医疗建议"); build.put("prompt","您本周摄入的热量达标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃谷类、水果以及根茎类的蔬菜。以上建议不成为医疗建议");
}else{ }else{
build.put("prompt","您本周摄入的热量超标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃水果,少吃肉类以及根茎类的蔬菜。以上建议不成为医疗建议"); build.put("prompt","您本周摄入的热量超标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃水果,少吃肉类以及根茎类的蔬菜。以上建议不成为医疗建议");

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -52,10 +52,13 @@ public class DevuceServiceImpl implements DevuceService {
.eqIfPresent(DevuceDO::getDeviceSn,updateReqVO.getDeviceSn())) == null) { .eqIfPresent(DevuceDO::getDeviceSn,updateReqVO.getDeviceSn())) == null) {
createDevuce(updateReqVO); createDevuce(updateReqVO);
}else{ }else{
//自动换绑
devuceMapper.update(new LambdaUpdateWrapper<DevuceDO>() devuceMapper.update(new LambdaUpdateWrapper<DevuceDO>()
.set(DevuceDO::getBind,updateReqVO.getBind()) .set(DevuceDO::getBind,DevuceDO.LAPSE)
.set(DevuceDO::getDeleted,Boolean.TRUE) .set(DevuceDO::getDeleted,Boolean.TRUE)
.eq(DevuceDO::getDeviceSn,updateReqVO.getDeviceSn())); .eq(DevuceDO::getDeviceSn,updateReqVO.getDeviceSn())
.eq(DevuceDO::getDeleted,Boolean.FALSE));
createDevuce(updateReqVO);
} }
} }
@ -106,6 +109,7 @@ public class DevuceServiceImpl implements DevuceService {
.map(DevuceDO::getDishesId).collect(Collectors.toList()); .map(DevuceDO::getDishesId).collect(Collectors.toList());
return dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>() return dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
.notIn(DishesDO::getId, collect)); .notIn(DishesDO::getId, collect)
.eq(DishesDO::getCarteenId,carteenId));
} }
} }