From d58a6d0f162a925555c0831df13af60e6e7a616a Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Mon, 8 Apr 2024 16:15:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/user/MemberUserServiceImpl.java | 8 ++------ .../system/service/devuce/DevuceServiceImpl.java | 10 +++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index e75d6884..aa9334ba 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -6,11 +6,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -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.hutool.core.util.*; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.exception.ServerException; @@ -557,7 +553,7 @@ public class MemberUserServiceImpl implements MemberUserService { Map build = MapUtil.builder(new HashMap()).build(); if(sum<=5000){ build.put("prompt","您本周摄入的热量不达标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃肉类、水果以及根茎类的蔬菜。以上建议不成为医疗建议"); - }else if(sum>=10000){ + }else if(sum<10000){ build.put("prompt","您本周摄入的热量达标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃谷类、水果以及根茎类的蔬菜。以上建议不成为医疗建议"); }else{ build.put("prompt","您本周摄入的热量超标，饮食均衡才能保证每天活动的能量和营养素供应充足，减肥也要吃饱，吃好哦。建议多吃水果,少吃肉类以及根茎类的蔬菜。以上建议不成为医疗建议"); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java index 8f336f50..1bd9826d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java @@ -52,10 +52,13 @@ public class DevuceServiceImpl implements DevuceService { .eqIfPresent(DevuceDO::getDeviceSn,updateReqVO.getDeviceSn())) == null) { createDevuce(updateReqVO); }else{ + //自动换绑 devuceMapper.update(new LambdaUpdateWrapper() - .set(DevuceDO::getBind,updateReqVO.getBind()) + .set(DevuceDO::getBind,DevuceDO.LAPSE) .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()); return dishesMapper.selectList(new LambdaQueryWrapperX() - .notIn(DishesDO::getId, collect)); + .notIn(DishesDO::getId, collect) + .eq(DishesDO::getCarteenId,carteenId)); } } \ No newline at end of file