瀏覽代碼

fix: 修复测试编译错误和 FoodService 列名映射错误

iwt 1 月之前
父節點
當前提交
481b7b237f

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/FoodService.java

@@ -60,7 +60,7 @@ public class FoodService {
         switch (col) {
             case "name":        return "name";
             case "category":    return "category";
-            case "calories":    return "kcal_per_100g";
+            case "calories":    return "calories";
             case "protein":     return "protein";
             case "carbs":       return "carbs";
             case "fat":         return "fat";

+ 4 - 4
cfc-backend/src/test/java/com/etotem/cfc/controller/EnergyControllerTest.java

@@ -59,7 +59,7 @@ public class EnergyControllerTest {
         when(userMapper.selectById(userId)).thenReturn(user);
         when(energyService.calculateFamilyEnergy(100L)).thenReturn(mockDto);
 
-        Result<EnergySandboxDTO> result = controller.getFamilyEnergySandbox(userId, null);
+        Result<?> result = controller.getFamilyEnergySandbox(userId, null);
 
         assertEquals(200, result.getCode());
         assertNotNull(result.getData());
@@ -76,7 +76,7 @@ public class EnergyControllerTest {
     public void getFamilyEnergySandbox_UserNotFound() {
         when(userMapper.selectById(999L)).thenReturn(null);
 
-        Result<EnergySandboxDTO> result = controller.getFamilyEnergySandbox(999L, null);
+        Result<?> result = controller.getFamilyEnergySandbox(999L, null);
 
         assertEquals(500, result.getCode());
         assertEquals("用户不存在", result.getMessage());
@@ -90,7 +90,7 @@ public class EnergyControllerTest {
 
         when(userMapper.selectById(1L)).thenReturn(user);
 
-        Result<EnergySandboxDTO> result = controller.getFamilyEnergySandbox(1L, null);
+        Result<?> result = controller.getFamilyEnergySandbox(1L, null);
 
         assertEquals(500, result.getCode());
         assertEquals("用户未加入家庭", result.getMessage());
@@ -114,7 +114,7 @@ public class EnergyControllerTest {
         when(userMapper.selectById(userId)).thenReturn(user);
         when(energyService.calculateFamilyEnergy(200L)).thenReturn(mockDto);
 
-        Result<EnergySandboxDTO> result = controller.getFamilyEnergySandbox(userId, null);
+        Result<?> result = controller.getFamilyEnergySandbox(userId, null);
 
         assertEquals(200, result.getCode());
         assertEquals(0, result.getData().getOverallScore());