ソースを参照

chore: auto bump version and changelog [skip ci]

iwt 1 ヶ月 前
コミット
bca08660eb

+ 8 - 8
cfc-backend/src/test/java/com/etotem/cfc/controller/HealthReportControllerTest.java

@@ -90,7 +90,7 @@ public class HealthReportControllerTest {
                 return r;
             });
 
-        Result<HealthReport> result = controller.createReport(params, 5L, 5L);
+        Result<HealthReport> result = controller.createReport(params, 5L, 5L, null);
         assertEquals(200, result.getCode());
         assertNotNull(result.getData().getId());
         assertEquals("physical_exam", result.getData().getReportType());
@@ -110,7 +110,7 @@ public class HealthReportControllerTest {
                 return r;
             });
 
-        Result<HealthReport> result = controller.createReport(params, 5L, 5L);
+        Result<HealthReport> result = controller.createReport(params, 5L, 5L, null);
         assertEquals(200, result.getCode());
         assertEquals("gut_flora", result.getData().getReportType());
         assertEquals("25岁", result.getData().getGutAge());
@@ -132,7 +132,7 @@ public class HealthReportControllerTest {
                 return r;
             });
 
-        Result<HealthReport> result = controller.createReport(params, 5L, 5L);
+        Result<HealthReport> result = controller.createReport(params, 5L, 5L, null);
         assertEquals(200, result.getCode());
         assertNotNull(result.getData().getId());
     }
@@ -142,7 +142,7 @@ public class HealthReportControllerTest {
         Map<String, Object> params = new HashMap<>();
         params.put("reportType", "physical_exam");
 
-        Result<HealthReport> result = controller.createReport(params, 5L, null);
+        Result<HealthReport> result = controller.createReport(params, 5L, null, null);
         assertEquals(500, result.getCode());
         assertTrue(result.getMessage().contains("childId"));
     }
@@ -152,7 +152,7 @@ public class HealthReportControllerTest {
         Map<String, Object> params = new HashMap<>();
         params.put("childId", 5L);
 
-        Result<HealthReport> result = controller.createReport(params, 5L, 5L);
+        Result<HealthReport> result = controller.createReport(params, 5L, 5L, null);
         assertEquals(500, result.getCode());
         assertTrue(result.getMessage().contains("reportType"));
     }
@@ -168,7 +168,7 @@ public class HealthReportControllerTest {
         Map<String, Object> params = new HashMap<>();
         params.put("childId", 5);
 
-        Result<HealthReport> result = controller.getLatestReport(params, 5L);
+        Result<HealthReport> result = controller.getLatestReport(params, 5L, null);
         assertEquals(200, result.getCode());
         assertEquals(5L, result.getData().getUserId().longValue());
     }
@@ -180,7 +180,7 @@ public class HealthReportControllerTest {
         Map<String, Object> params = new HashMap<>();
         params.put("childId", 999);
 
-        Result<HealthReport> result = controller.getLatestReport(params, 999L);
+        Result<HealthReport> result = controller.getLatestReport(params, 999L, null);
         assertEquals(200, result.getCode());
         assertNull(result.getData());
     }
@@ -188,7 +188,7 @@ public class HealthReportControllerTest {
     @Test
     public void getLatestReport_MissingChildId() {
         Map<String, Object> params = new HashMap<>();
-        Result<HealthReport> result = controller.getLatestReport(params, null);
+        Result<HealthReport> result = controller.getLatestReport(params, null, null);
         assertEquals(500, result.getCode());
         assertTrue(result.getMessage().contains("childId"));
     }

+ 2 - 2
cfc-backend/src/test/java/com/etotem/cfc/controller/WishControllerTest.java

@@ -354,7 +354,7 @@ public class WishControllerTest {
         );
         when(wishService.getParentPendingWishes(100L)).thenReturn(pending);
 
-        Result<List<WishDTO>> result = controller.getPendingWishes(1L, body);
+        Result<List<WishDTO>> result = controller.getPendingWishes(1L, 100L);
         assertEquals(200, result.getCode());
         assertEquals(2, result.getData().size());
     }
@@ -363,7 +363,7 @@ public class WishControllerTest {
     public void getPendingWishes_NoFamilyId() {
         Map<String, Object> body = new HashMap<>();
 
-        Result<List<WishDTO>> result = controller.getPendingWishes(1L, body);
+        Result<List<WishDTO>> result = controller.getPendingWishes(1L, null);
         assertEquals(500, result.getCode());
         assertEquals("请指定家庭ID", result.getMessage());
     }

+ 1 - 1
cfc-backend/src/test/java/com/etotem/cfc/integration/GrowthRecordSyncFlowTest.java

@@ -161,7 +161,7 @@ public class GrowthRecordSyncFlowTest {
         when(growthRecordService.createRecord(any(GrowthRecord.class))).thenReturn(savedRecord);
 
         // === When:提交创建档案和购买测评 ===
-        Result<Map<String, Object>> result = growthRecordController.createRecordWithOrder(request, PARENT_USER_ID, CHILD_ID);
+        Result<Map<String, Object>> result = growthRecordController.createRecordWithOrder(request, PARENT_USER_ID, FAMILY_ID, CHILD_ID);
 
         // === Then:档案创建成功,订单也创建 ===
         assertEquals(200, result.getCode());

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-b071004bc1490f5f08cf8deac860fe5892d143c8
+c08211a5071095a026aba90e66ae0635e2cbdffc

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.813",
+  "version": "1.0.814",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 16 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,22 @@
 
 ---
 
+## v1.0.814 (2026-08-05)
+
+### 新功能
+- 库存管理 - 路由+侧边栏
+- 库存管理 - ProductManage.vue增加库存按钮+弹窗
+- 库存管理 - InventoryInboundCreate.vue
+- 库存管理 - InventoryManage.vue(4标签页)
+- 库存管理 - 管理端API调用
+- 库存管理 - 订单集成(支付/取消/退款库存流水 + bundle穿透)
+- 库存管理 - AdminInventoryController
+- 库存管理 - InventoryService
+
+### Bug 修复
+- Controller gutFlora 入库补全 taxonomy+pathogen 8 列表 (对齐 Service); 确认页新增 taxonomy 分类组成 + 病原菌 + 益生菌种区块(采到啥显示啥)
+
+
 ## v1.0.813 (2026-08-05)
 
 ### 新功能

+ 17 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.813
+> 当前版本: v1.0.814
 
 ## 历史版本
 
@@ -8,6 +8,22 @@
 
 ---
 
+## v1.0.814 (2026-08-05)
+
+### 新功能
+- 库存管理 - 路由+侧边栏
+- 库存管理 - ProductManage.vue增加库存按钮+弹窗
+- 库存管理 - InventoryInboundCreate.vue
+- 库存管理 - InventoryManage.vue(4标签页)
+- 库存管理 - 管理端API调用
+- 库存管理 - 订单集成(支付/取消/退款库存流水 + bundle穿透)
+- 库存管理 - AdminInventoryController
+- 库存管理 - InventoryService
+
+### Bug 修复
+- Controller gutFlora 入库补全 taxonomy+pathogen 8 列表 (对齐 Service); 确认页新增 taxonomy 分类组成 + 病原菌 + 益生菌种区块(采到啥显示啥)
+
+
 ## v1.0.813 (2026-08-05)
 
 ### 新功能