Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 1 месяц назад
Родитель
Сommit
0d69e00371

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

@@ -139,7 +139,7 @@ public class EnergyControllerTest {
 
         when(energyService.getOverview(10L)).thenReturn(mockOverview);
 
-        Result<Map<String, Object>> result = controller.getEnergyOverview(params, 10L);
+        Result<Map<String, Object>> result = controller.getEnergyOverview(params, 10L, null);
 
         assertEquals(200, result.getCode());
         assertNotNull(result.getData());
@@ -169,7 +169,7 @@ public class EnergyControllerTest {
 
         when(energyService.getOverview(20L)).thenReturn(mockOverview);
 
-        Result<Map<String, Object>> result = controller.getEnergyOverview(params, 20L);
+        Result<Map<String, Object>> result = controller.getEnergyOverview(params, 20L, null);
 
         assertEquals(200, result.getCode());
         assertEquals(100, result.getData().get("bodyScore"));
@@ -183,7 +183,7 @@ public class EnergyControllerTest {
     public void getEnergyOverview_NullChildId() {
         Map<String, Object> params = new HashMap<>();
 
-        Result<Map<String, Object>> result = controller.getEnergyOverview(params, null);
+        Result<Map<String, Object>> result = controller.getEnergyOverview(params, null, null);
 
         assertEquals(500, result.getCode());
         assertEquals("childId不能为空", result.getMessage());
@@ -200,7 +200,7 @@ public class EnergyControllerTest {
 
         when(energyService.getOverview(30L)).thenReturn(mockOverview);
 
-        Result<Map<String, Object>> result = controller.getEnergyOverview(params, 30L);
+        Result<Map<String, Object>> result = controller.getEnergyOverview(params, 30L, null);
 
         assertEquals(200, result.getCode());
         assertEquals(0, result.getData().get("totalEnergy"));
@@ -225,7 +225,7 @@ public class EnergyControllerTest {
 
         when(energyService.getLogs(10L, null, 1, 10)).thenReturn(page);
 
-        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L);
+        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L, null);
 
         assertEquals(200, result.getCode());
         assertNotNull(result.getData());
@@ -249,7 +249,7 @@ public class EnergyControllerTest {
 
         when(energyService.getLogs(10L, "body", 1, 10)).thenReturn(page);
 
-        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L);
+        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L, null);
 
         assertEquals(200, result.getCode());
         assertEquals(1, result.getData().getTotal());
@@ -267,7 +267,7 @@ public class EnergyControllerTest {
 
         when(energyService.getLogs(10L, null, 1, 10)).thenReturn(emptyPage);
 
-        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L);
+        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 10L, null);
 
         assertEquals(200, result.getCode());
     }
@@ -276,7 +276,7 @@ public class EnergyControllerTest {
     public void getEnergyLogs_NullChildId() {
         Map<String, Object> params = new HashMap<>();
 
-        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, null);
+        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, null, null);
 
         assertEquals(500, result.getCode());
         assertEquals("childId不能为空", result.getMessage());
@@ -295,7 +295,7 @@ public class EnergyControllerTest {
 
         when(energyService.getLogs(99L, null, 1, 10)).thenReturn(emptyPage);
 
-        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 99L);
+        Result<Page<EnergyLog>> result = controller.getEnergyLogs(params, 99L, null);
 
         assertEquals(200, result.getCode());
         assertEquals(0, result.getData().getTotal());
@@ -317,7 +317,7 @@ public class EnergyControllerTest {
                 new HashMap<String, Object>() {{ put("dimension", "wealth"); put("ratio", 0.1); }}
         ));
 
-        Result<String> result = controller.configureSourceRatios(params, 1L);
+        Result<String> result = controller.configureSourceRatios(params, 1L, null);
 
         assertEquals(200, result.getCode());
         assertEquals("配置成功", result.getData());
@@ -330,7 +330,7 @@ public class EnergyControllerTest {
         params.put("sourceId", 5L);
         params.put("ratios", Collections.emptyList());
 
-        Result<String> result = controller.configureSourceRatios(params, 1L);
+        Result<String> result = controller.configureSourceRatios(params, 1L, null);
 
         assertEquals(500, result.getCode());
         assertEquals("sourceType和sourceId不能为空", result.getMessage());
@@ -343,7 +343,7 @@ public class EnergyControllerTest {
         params.put("sourceId", 5L);
         params.put("ratios", Collections.emptyList());
 
-        Result<String> result = controller.configureSourceRatios(params, 1L);
+        Result<String> result = controller.configureSourceRatios(params, 1L, null);
 
         assertEquals(500, result.getCode());
         assertEquals("ratios不能为空", result.getMessage());
@@ -356,7 +356,7 @@ public class EnergyControllerTest {
         params.put("sourceId", 3L);
         // ratios not provided
 
-        Result<String> result = controller.configureSourceRatios(params, 1L);
+        Result<String> result = controller.configureSourceRatios(params, 1L, null);
 
         assertEquals(500, result.getCode());
         assertEquals("ratios不能为空", result.getMessage());

+ 4 - 4
cfc-backend/src/test/java/com/etotem/cfc/integration/EnergySystemFlowTest.java

@@ -143,7 +143,7 @@ public class EnergySystemFlowTest {
         grantParams.put("dimensionCode", dimensionCode);
 
         // === When:触发能量发放 ===
-        Result<EnergyLog> result = energyController.grantEnergy(grantParams, CHILD_ID);
+        Result<EnergyLog> result = energyController.grantEnergy(grantParams, CHILD_ID, null);
 
         // === Then:Milestone-2 - 能量发放成功 ===
         assertEquals(200, result.getCode());
@@ -175,7 +175,7 @@ public class EnergySystemFlowTest {
         deductParams.put("amount", energyDeduct);
 
         // === When:使用能量兑换心愿 ===
-        Result<Boolean> result = energyController.deductForWish(deductParams, CHILD_ID);
+        Result<Boolean> result = energyController.deductForWish(deductParams, CHILD_ID, null);
 
         // === Then:Milestone-3 - 能量扣减成功 ===
         assertEquals(200, result.getCode());
@@ -239,7 +239,7 @@ public class EnergySystemFlowTest {
                 .thenReturn(mockPage);
 
         // === When:查询能量流水 ===
-        Result<Page<EnergyLog>> result = energyController.getEnergyLogs(request, CHILD_ID);
+        Result<Page<EnergyLog>> result = energyController.getEnergyLogs(request, CHILD_ID, null);
 
         // === Then:返回分页数据 ===
         assertEquals(200, result.getCode());
@@ -275,7 +275,7 @@ public class EnergySystemFlowTest {
         when(energyService.getOverview(CHILD_ID)).thenReturn(mockOverview);
 
         // === When:请求能量概览 ===
-        Result<Map<String, Object>> result = energyController.getEnergyOverview(request, CHILD_ID);
+        Result<Map<String, Object>> result = energyController.getEnergyOverview(request, CHILD_ID, null);
 
         // === Then:Milestone-5 - 返回概览数据包含健康指数 ===
         assertEquals(200, result.getCode());

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-af621f141f1dd82f865c6dbfdf3508e4c0619892
+b071004bc1490f5f08cf8deac860fe5892d143c8

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.812",
+  "version": "1.0.813",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.812",
+      "version": "1.0.813",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",