From a7241e635249b625c2c828601048a85918925822 Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Fri, 4 Jul 2025 10:56:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?jsk=20=20=20=E7=94=B5=E8=AF=9D=E5=8A=A0?= =?UTF-8?q?=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HealthPersonInfoServiceImpl.java | 12 ++++++------ .../kitchen/KitchenStaffEnterExitRecordMapper.xml | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java index 3d0c64d..cc25e21 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java @@ -53,12 +53,12 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonInfo.getArticleTitle()); healthPersonInfo.setEncryptedSearchValue(encryptedSearchValue); List list=healthPersonInfoMapper.selectHealthPersonInfoList(healthPersonInfo); - if(CollUtil.isNotEmpty(list)) { - for(HealthPersonInfo vo : list) { - vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile())); - vo.setMobile(maskPhoneNumber(vo.getMobile())); - } - } +// if(CollUtil.isNotEmpty(list)) { +// for(HealthPersonInfo vo : list) { +// vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile())); +// vo.setMobile(maskPhoneNumber(vo.getMobile())); +// } +// } return list; } public static String maskPhoneNumber(String phoneNumber) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml index c0732ea..0e29066 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml @@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and kseer.enter_img_url = #{enterImgUrl} and substring(kseer.enter_time,1,10) >= #{startDate} and #{endDate}>= substring(kseer.enter_time,1,10) + order by kseer.enter_time desc + select count(1) from cook_nutrition where nutrition_type_id in + + #{nutritionTypeId} + + \ No newline at end of file From 7afc1fbad0f67e39f745da4d5021478b4243bbd1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 4 Jul 2025 13:43:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=85=83->=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cook/service/impl/CookDishesServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java index 7f44fa4..5b7f9e2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java @@ -104,9 +104,15 @@ public class CookDishesServiceImpl implements ICookDishesService { @Transactional(rollbackFor = Exception.class) public int insertCookDishes(CookDishes cookDishes) { cookDishes.setCreateTime(DateUtils.getNowDate()); + cookDishes.setCreateBy(SecurityUtils.getUsername()); try { checkParam(cookDishes, false); - //计算营养信息含量 + //转换价格金额元->分 + cookDishes.setPrice(Objects.isNull(cookDishes.getPrice()) ? 0L : cookDishes.getPrice() * 100); + cookDishes.setUnitPrice(Objects.isNull(cookDishes.getUnitPrice()) ? 0L : cookDishes.getUnitPrice() * 100); + cookDishes.setLargePrice(Objects.isNull(cookDishes.getLargePrice()) ? 0L : cookDishes.getLargePrice() * 100); + cookDishes.setLittlePrice(Objects.isNull(cookDishes.getLittlePrice()) ? 0L : cookDishes.getLittlePrice() * 100); + cookDishes.setMaterialCost(Objects.isNull(cookDishes.getMaterialCost()) ? 0L : cookDishes.getMaterialCost() * 100); //添加菜品 cookDishesMapper.insertCookDishes(cookDishes); //添加菜品-原料关联关系 @@ -131,8 +137,15 @@ public class CookDishesServiceImpl implements ICookDishesService { @Transactional(rollbackFor = Exception.class) public int updateCookDishes(CookDishes cookDishes) { cookDishes.setUpdateTime(DateUtils.getNowDate()); + cookDishes.setUpdateBy(SecurityUtils.getUsername()); try { checkParam(cookDishes, true); + //转换价格金额元->分 + cookDishes.setPrice(Objects.isNull(cookDishes.getPrice()) ? 0L : cookDishes.getPrice() * 100); + cookDishes.setUnitPrice(Objects.isNull(cookDishes.getUnitPrice()) ? 0L : cookDishes.getUnitPrice() * 100); + cookDishes.setLargePrice(Objects.isNull(cookDishes.getLargePrice()) ? 0L : cookDishes.getLargePrice() * 100); + cookDishes.setLittlePrice(Objects.isNull(cookDishes.getLittlePrice()) ? 0L : cookDishes.getLittlePrice() * 100); + cookDishes.setMaterialCost(Objects.isNull(cookDishes.getMaterialCost()) ? 0L : cookDishes.getMaterialCost() * 100); //修改菜品 cookDishesMapper.updateCookDishes(cookDishes); //删除菜品-原料关联关系