qmj 1 неделя назад
Родитель
Сommit
5dbbd65f64

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/app/mendian/FoodSpecController.java

@@ -80,8 +80,8 @@ public class FoodSpecController extends BaseController
             }
             saveOrUpdateSpecs(s);
             // 级联规格值
-            if (s.getFoodSpecsItems() != null) {
-                for (FoodSpecsValue v : s.getFoodSpecsItems()) {
+            if (s.getObjects() != null) {
+                for (FoodSpecsValue v : s.getObjects()) {
                     v.setParentId(s.getId());
                     if (v.getIsOpen() == null) {
                         v.setIsOpen(true);
@@ -207,7 +207,7 @@ public class FoodSpecController extends BaseController
         Map<Long, List<FoodSpecsValue>> map = values.stream()
                 .collect(Collectors.groupingBy(FoodSpecsValue::getParentId));
         for (FoodSpecs s : list) {
-            s.setFoodSpecsItems(map.getOrDefault(s.getId(), new ArrayList<>()));
+            s.setObjects(map.getOrDefault(s.getId(), new ArrayList<>()));
         }
     }
 }

+ 1 - 3
ruoyi-admin/src/main/java/com/ruoyi/app/mendian/PosFoodController.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.app.mendian.dto.FoodSearchOutput;
-import com.ruoyi.app.utils.DateUtil;
 import com.ruoyi.app.utils.ImageCompressUtils;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
@@ -29,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
 
 import jakarta.servlet.http.HttpServletResponse;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -732,7 +730,7 @@ public class PosFoodController extends BaseController {
                     copy.setSort(src.getSort());
                     copy.setIsOpen(src.getIsOpen());
                     copy.setIsDelete(src.getIsDelete());
-                    copy.setFoodSpecsItems(valueMap.getOrDefault(src.getId(), new ArrayList<>()));
+                    copy.setObjects(valueMap.getOrDefault(src.getId(), new ArrayList<>()));
                     fsList.add(copy);
                 }
             }

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/FoodSpecs.java

@@ -66,5 +66,5 @@ public class FoodSpecs
 
     /** 规格值列表(不入库,保存时作入参、查询时作出参) */
     @TableField(exist = false)
-    private List<FoodSpecsValue> foodSpecsItems;
+    private List<FoodSpecsValue> objects;
 }