Revert "jsk 预定餐"

This reverts commit 908dbaaef0.

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java

@@ -6,7 +6,7 @@ import com.bonus.core.menu.utils.NutritionEntity;
 
 import java.util.Map;
 
-public interface MenuDishesService  {
+public interface MenuDishesService extends IService<MenuDishes> {
 //   Long addMenuDishes(MenuDishesAddDTO dishesAddDTO, Integer customId);
 //
 //   Page<MenuDishesPageVO> getMenuDishesPage(String content);

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java

@@ -16,8 +16,6 @@ import com.bonus.core.menu.utils.NutritionEntity;
 import com.bonus.core.menu.utils.NutritionEntityUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,7 +23,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
-public class MenuDishesServiceImpl  implements MenuDishesService {
+public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDishes> implements MenuDishesService {
    private static final Logger log = LoggerFactory.getLogger(MenuDishesServiceImpl.class);
 
 //   @Lazy
@@ -117,9 +115,9 @@ public class MenuDishesServiceImpl  implements MenuDishesService {
 //      name = "yunshitangTaskExecutor"
 //   )
 //   private AsyncTaskExecutor asyncTaskExecutor;
-   @Autowired
+//   @Autowired
-   @Lazy
+//   @Lazy
-   private MenuDishesMapper menuDishesMapper;
+//   private MenuDishesMapper menuDishesMapper;
 //   @Autowired
 //   @Lazy
 //   private MenuaiServiceApi menuaiServiceApi;
@@ -184,33 +182,6 @@ public class MenuDishesServiceImpl  implements MenuDishesService {
 //   @Transactional(
 //      rollbackFor = {Exception.class}
 //   )
-
-   @Override
-   public NutritionEntity getNutrientInfo(Map<Long, Double> dishesQuantityMap) {
-      LogUtil.info("查询营养信息", dishesQuantityMap);
-      if (CollUtil.isNotEmpty(dishesQuantityMap)) {
-         List<Long> dishesIdList = ListUtil.toList(dishesQuantityMap.keySet());
-         List<MenuDishes> menuDishesList = this.getMenuDishesList(dishesIdList);
-         if (CollUtil.isNotEmpty(menuDishesList)) {
-            List<NutritionEntity> nutritionEntityList = (List)menuDishesList.stream().map((item) -> {
-               Double weight = (Double)dishesQuantityMap.get(item.getDishesId());
-               NutritionEntity nutritionEntity = (NutritionEntity) BeanUtil.copyProperties(item, NutritionEntity.class, new String[0]);
-               nutritionEntity.setWeight(weight);
-               nutritionEntity.setBaseWeight(item.getWeight());
-               return nutritionEntity;
-            }).collect(Collectors.toList());
-            return NutritionEntityUtil.countNutrition(nutritionEntityList);
-         }
-      }
-
-      return new NutritionEntity();
-   }
-
-   public List<MenuDishes> getMenuDishesList(List<Long> dishesIdList) {
-      return null;
-//              menuDishesMapper.list((Wrapper)((LambdaQueryWrapper<MenuDishes>) Wrappers.lambdaQuery(MenuDishes.class)
-//              .in(MenuDishes::getDishesId, dishesIdList)).eq(MenuDishes::getDelFlag, LeConstants.COMMON_NO));
-   }
 //   public Long addMenuDishes(MenuDishesAddDTO dishesAddDTO, Integer customId) {
 //      Long count = ((MenuDishesMapper)this.baseMapper).selectCount((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuDishes.class).eq(MenuDishes::getDishesName, dishesAddDTO.getDishesName())).eq(MenuDishes::getDelFlag, DelFlagEnum.DEL_FALSE.key()));
 //      if (count != null && count > 0L) {
@@ -2580,6 +2551,31 @@ public class MenuDishesServiceImpl  implements MenuDishesService {
 //      }, Collectors.mapping(DishesLabelDto::getName, Collectors.toList())));
 //   }
 
+   @Override
+   public NutritionEntity getNutrientInfo(Map<Long, Double> dishesQuantityMap) {
+      LogUtil.info("查询营养信息", dishesQuantityMap);
+      if (CollUtil.isNotEmpty(dishesQuantityMap)) {
+         List<Long> dishesIdList = ListUtil.toList(dishesQuantityMap.keySet());
+         List<MenuDishes> menuDishesList = this.getMenuDishesList(dishesIdList);
+         if (CollUtil.isNotEmpty(menuDishesList)) {
+            List<NutritionEntity> nutritionEntityList = (List)menuDishesList.stream().map((item) -> {
+               Double weight = (Double)dishesQuantityMap.get(item.getDishesId());
+               NutritionEntity nutritionEntity = (NutritionEntity) BeanUtil.copyProperties(item, NutritionEntity.class, new String[0]);
+               nutritionEntity.setWeight(weight);
+               nutritionEntity.setBaseWeight(item.getWeight());
+               return nutritionEntity;
+            }).collect(Collectors.toList());
+            return NutritionEntityUtil.countNutrition(nutritionEntityList);
+         }
+      }
+
+      return new NutritionEntity();
+   }
+
+   public List<MenuDishes> getMenuDishesList(List<Long> dishesIdList) {
+      return this.list((Wrapper)((LambdaQueryWrapper<MenuDishes>) Wrappers.lambdaQuery(MenuDishes.class)
+              .in(MenuDishes::getDishesId, dishesIdList)).eq(MenuDishes::getDelFlag, LeConstants.COMMON_NO));
+   }
 //
 //   public void updateDishesNutrition(List<Long> materialIds) {
 //      List<MenuUpdateDishesModel> menuUpdateDishesModels = this.menuMaterialDishesService.selectDishesList(materialIds);