Ver Fonte

chore: auto bump version and changelog [skip ci]

iwt há 1 mês atrás
pai
commit
bac86ab587
20 ficheiros alterados com 41 adições e 29 exclusões
  1. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/controller/EnergyController.java
  2. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/InviteCardController.java
  3. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/MembershipController.java
  4. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/UserController.java
  5. 3 3
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminController.java
  6. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminEarningsController.java
  7. 3 3
      cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyInviteController.java
  8. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyUserController.java
  9. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/family/InteractionLogController.java
  10. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/controller/family/ParentController.java
  11. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/family/TeacherFamilyBindingController.java
  12. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/guide/PlanReviewController.java
  13. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/controller/mind/MindFortuneController.java
  14. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/controller/parent/ParentAssessmentController.java
  15. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/stats/StatsController.java
  16. 1 1
      cfc-web/.last_build_commit
  17. 2 2
      cfc-web/package-lock.json
  18. 1 1
      cfc-web/package.json
  19. 6 0
      cfc-web/public/CHANGELOG-v1.0.md
  20. 7 1
      cfc-web/public/CHANGELOG.md

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/EnergyController.java

@@ -44,7 +44,7 @@ public class EnergyController {
             return Result.error("用户不存在");
         }
         if (user.getFamilyId() == null) {
-            return Result.error("用户未加入家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         EnergySandboxDTO dto = energyService.calculateFamilyEnergy(user.getFamilyId());
@@ -245,7 +245,7 @@ public class EnergyController {
 
         User user = userMapper.selectById(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户未加入家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         EnergySandboxDTO sandbox = energyService.calculateFamilyEnergy(user.getFamilyId());

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/InviteCardController.java

@@ -70,7 +70,7 @@ public class InviteCardController {
             }
         } else if ("family".equals(type) || "guide".equals(type)) {
             if (familyId == null) {
-                return Result.error("用户未加入家庭");
+                return Result.noFamily("请先创建或加入家庭");
             }
             refId = familyId;
             Family family = familyMapper.selectById(refId);

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/MembershipController.java

@@ -138,7 +138,7 @@ public class MembershipController {
 
         User user = userMapper.selectById(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户无家庭信息");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         MembershipLevelDTO level = membershipService.getCurrentLevel(user.getFamilyId());

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/UserController.java

@@ -129,7 +129,7 @@ public class UserController {
 
         Long familyId = user.getFamilyId();
         if (familyId == null) {
-            return Result.error("用户未加入家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         Family family = familyMapper.selectById(familyId);

+ 3 - 3
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminController.java

@@ -305,7 +305,7 @@ public class AdminController {
         // 获取用户的家庭 ID,只返回该家庭的模板
         com.etotem.cfc.entity.User user = userService.getUserInfo(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户必须属于某个家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
         
         return Result.success(rewardMapper.selectList(new LambdaQueryWrapper<Reward>()
@@ -318,7 +318,7 @@ public class AdminController {
         // 强制关联家庭
         com.etotem.cfc.entity.User user = userService.getUserInfo(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户必须属于某个家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
         
         reward.setFamilyId(user.getFamilyId());
@@ -348,7 +348,7 @@ public class AdminController {
         // 验证家庭归属
         com.etotem.cfc.entity.User user = userService.getUserInfo(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户必须属于某个家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
         
         Reward existingReward = rewardMapper.selectById(id);

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminEarningsController.java

@@ -41,7 +41,7 @@ public class AdminEarningsController {
     @PostMapping("/family/{familyId}/summary")
     public Result<FamilyEarningsSummaryDTO> familySummary(@PathVariable Long familyId) {
         if (familyId == null) {
-            return Result.error("familyId不能为空");
+            return Result.noFamily("请先创建或加入家庭");
         }
         return Result.success(familyEarningsService.getFamilySummary(familyId));
     }

+ 3 - 3
cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyInviteController.java

@@ -68,7 +68,7 @@ public class FamilyInviteController {
 
         User user = userMapper.selectById(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户没有家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         Family family = familyMapper.selectById(user.getFamilyId());
@@ -254,7 +254,7 @@ public class FamilyInviteController {
 
         User user = userMapper.selectById(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户没有家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         String token;
@@ -365,7 +365,7 @@ public class FamilyInviteController {
 
         User user = userMapper.selectById(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户没有家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         try {

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyUserController.java

@@ -181,7 +181,7 @@ public class FamilyUserController {
 
         Long familyId = user.getFamilyId();
         if (familyId == null) {
-            return Result.error("用户未加入家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         // 获取家庭信息
@@ -249,7 +249,7 @@ public class FamilyUserController {
         }
         Long familyId = operator.getFamilyId();
         if (familyId == null) {
-            return Result.error("用户未加入家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
         Family family = familyMapper.selectById(familyId);
         if (family == null) {

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/family/InteractionLogController.java

@@ -39,7 +39,7 @@ public class InteractionLogController {
   if (dto.getFamilyId() == null) {
     User user = userMapper.selectById(userId);
     if (user == null || user.getFamilyId() == null) {
-      return Result.error("用户未关联家庭,无法添加互动记录");
+      return Result.noFamily("请先创建或加入家庭");
     }
     dto.setFamilyId(user.getFamilyId());
   }

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/family/ParentController.java

@@ -51,7 +51,7 @@ public class ParentController {
     public Result<List<RewardDTO>> getParentWishlist(@RequestAttribute("userId") Long userId) {
         User user = userService.getUserInfo(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户无家庭信息");
+            return Result.noFamily("请先创建或加入家庭");
         }
         
         // 获取家庭所有可用的奖励(包括孩子创建的待审批心愿)
@@ -66,7 +66,7 @@ public class ParentController {
     public Result<List<RewardDTO>> getFamilyWishlist(@RequestAttribute("userId") Long userId) {
         User user = userService.getUserInfo(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户无家庭信息");
+            return Result.noFamily("请先创建或加入家庭");
         }
         
         List<RewardDTO> rewards = rewardService.getFamilyRewardLibrary(user.getFamilyId());

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/family/TeacherFamilyBindingController.java

@@ -45,7 +45,7 @@ public class TeacherFamilyBindingController {
     public Result<List<TeacherFamilyBindingRequest>> getPending(@RequestAttribute("userId") Long userId) {
         User user = userMapper.selectById(userId);
         if (user == null || user.getFamilyId() == null) {
-            return Result.error("用户没有家庭");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         List<TeacherFamilyBindingRequest> list = bindingRequestService.getPendingByFamily(user.getFamilyId());

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/guide/PlanReviewController.java

@@ -44,7 +44,7 @@ public class PlanReviewController {
             return Result.error("无权限");
         }
         String status = (String) body.get("status");
-        if (familyId == null) return Result.error("familyId required");
+        if (familyId == null) return Result.noFamily("请先创建或加入家庭");
         LambdaQueryWrapper<TaskPlanInstance> w = new LambdaQueryWrapper<TaskPlanInstance>()
                 .eq(TaskPlanInstance::getFamilyId, familyId)
                 .orderByDesc(TaskPlanInstance::getCreatedAt);

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/mind/MindFortuneController.java

@@ -49,7 +49,7 @@ public class MindFortuneController {
     public Result<FamilyFortune> refreshFortune(@RequestAttribute("userId") Long userId) {
         if (userId == null) return Result.error("请先登录");
         Long familyId = membershipService.getUserFamilyId(userId);
-        if (familyId == null) return Result.error("请先创建家庭");
+        if (familyId == null) return Result.noFamily("请先创建或加入家庭");
         FamilyFortune fortune = fortuneService.getFamilyFortune(familyId, LocalDate.now());
         fortune.setLuckyDirection(fortuneService.calculateLuckyDirection(familyId, LocalDate.now()));
         fortuneService.saveFamilyFortune(fortune);
@@ -67,7 +67,7 @@ public class MindFortuneController {
             @RequestBody ExportReportRequest request) {
         if (userId == null) return Result.error("请先登录");
         Long familyId = membershipService.getUserFamilyId(userId);
-        if (familyId == null) return Result.error("请先创建家庭");
+        if (familyId == null) return Result.noFamily("请先创建或加入家庭");
         try {
             // 文件大小校验
             if (request.imageBase64 == null || request.imageBase64.length() > 4 * 1024 * 1024) {

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/parent/ParentAssessmentController.java

@@ -38,7 +38,7 @@ public class ParentAssessmentController {
     public Result<Map<String, Object>> getCurrentAssessment(@RequestAttribute("userId") Long userId) {
         Long familyId = getFamilyIdByUserId(userId);
         if (familyId == null) {
-            return Result.error("未找到家庭信息");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         FamilyAssessmentConfig config = assessmentService.getFamilyConfig(familyId);
@@ -92,7 +92,7 @@ public class ParentAssessmentController {
     public Result<AssessmentRecord> createAssessment(@RequestAttribute("userId") Long userId) {
         Long familyId = getFamilyIdByUserId(userId);
         if (familyId == null) {
-            return Result.error("未找到家庭信息");
+            return Result.noFamily("请先创建或加入家庭");
         }
 
         AssessmentMaterial material = assessmentService.getActiveMaterial();

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/stats/StatsController.java

@@ -140,7 +140,7 @@ public class StatsController {
             @RequestBody Map<String, Object> params) {
         User user = userMapper.selectById(userId);
         if (user == null) return Result.error("用户不存在");
-        if (user.getFamilyId() == null) return Result.error("未关联家庭");
+        if (user.getFamilyId() == null) return Result.noFamily("请先创建或加入家庭");
 
         Date startDate = parseDate(params.get("startDate"));
         Date endDate = parseDate(params.get("endDate"));

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-bdedf86b46fb0f14075493ee311cd502433ebe13
+9c4e7e99c55988fce071c2916f842b610e568052

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

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

+ 1 - 1
cfc-web/package.json

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

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

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.816 (2026-08-05)
+
+### Bug 修复
+- 迁移172 products添加min_stock_alert列+同步schema.sql(库存管理功能遗漏)
+
+
 ## v1.0.815 (2026-08-05)
 
 ### 新功能

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

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.815
+> 当前版本: v1.0.816
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.816 (2026-08-05)
+
+### Bug 修复
+- 迁移172 products添加min_stock_alert列+同步schema.sql(库存管理功能遗漏)
+
+
 ## v1.0.815 (2026-08-05)
 
 ### 新功能