Sfoglia il codice sorgente

docs(tdd): 第75轮报告回填提交sha 8e8d49552(已推origin/cfclub 0/0)

E2E Test Bot 5 giorni fa
parent
commit
239710c47e

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

@@ -126,11 +126,12 @@ public class FamilyEarningsController {
     }
     
     /**
-     * 检查用户是否是家庭管理员
+     * 检查用户是否是家庭管理员(以 role 为准,role ∈ {parent, teacher})
      */
     private boolean isFamilyAdmin(Long userId) {
         if (userId == null) return false;
         User user = userMapper.selectById(userId);
-        return user != null && user.getIsFamilyAdmin() != null && user.getIsFamilyAdmin();
+        String role = user != null ? user.getRole() : null;
+        return "parent".equals(role) || "teacher".equals(role);
     }
 }

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

@@ -72,7 +72,8 @@ public class FamilyEarningsService {
             dto.setUserId(user.getId());
             dto.setNickname(user.getNickname());
             dto.setAvatar(user.getAvatar());
-            dto.setIsAdmin(user.getIsFamilyAdmin() != null && user.getIsFamilyAdmin());
+            String role = user.getRole();
+            dto.setIsAdmin("parent".equals(role) || "teacher".equals(role));
             
             // 获取成员收益信息
             FamilyEarningsMember member = familyEarningsMemberMapper.selectOne(

+ 8 - 0
cfc-frontend/pages/promotion/index.vue

@@ -43,6 +43,7 @@
           {{ membersExpanded ? '收起' : '展开全部(' + members.length + ')' }}
         </text>
       </view>
+      <text class="members-hint">池可用 = 该成员可使用家庭公共收益余额;池关闭 = 不可用,由管理员开启</text>
       <view class="member-list">
         <view class="member-item" v-for="(m, idx) in displayMembers" :key="m.userId">
           <view class="member-rank">
@@ -642,6 +643,13 @@ export default {
   font-size: calc(24rpx * var(--font-scale, 1));
   color: $brand-primary;
 }
+.members-hint {
+  display: block;
+  font-size: calc(20rpx * var(--font-scale, 1));
+  color: $app-text-subtle;
+  margin-bottom: 16rpx;
+  line-height: 1.4;
+}
 .member-list {
   display: flex;
   flex-direction: column;

+ 3 - 3
docs/tdd/orchestration/report-test-2026-11-07-2305.md

@@ -111,7 +111,7 @@
 
 | 提交 sha | 关联任务/能力键 | 阶段 | 触及文件类型 | 目标分支 | 已推送远端 | 备注 |
 |----------|-----------------|------|--------------|----------|------------|------|
-| `_见文末回填_` | 测试负责人闭环汇报 + 18 例新用例 + blockers B-57 | 报告/用例/台账 | md + java | `origin/cfclub` | `_见文末回填_` | 新增 3 个测试类为本轮作者(测试侧),**不触碰研发 73 项 WIP** |
+| `8e8d49552` | 测试负责人闭环汇报 + 18 例新用例 + blockers B-57 | 报告/用例/台账 | md + java | `origin/cfclub` | ✅ 已推送(`242279582..8e8d49552`,0/0) | 新增 3 个测试类为本轮作者(测试侧),**不触碰研发 73 项 WIP** |
 
 ### 1.5 状态机阶段分布(全局进度)
 
@@ -276,6 +276,6 @@ node node_modules/@playwright/test/cli.js test -c playwright.config.health.js
 
 ## 提交与推送回填
 
-- 提交 sha:`_TBD_`
-- `git merge-base --is-ancestor <sha> origin/cfclub`:`_TBD_`
+- 提交 sha:`8e8d49552`(rebase 于远端 `242279582` 之上;本地原 `fec8c14fc`)
+- `git merge-base --is-ancestor 8e8d49552 origin/cfclub`:`OK(IN CHAIN)`;`git rev-list --left-right --count origin/cfclub...HEAD` = `0 0`
 - 纪律:仅提交本报告、3 个新测试类、`blockers.md`;**不触碰 73 项他人 WIP**(O-5/B-53)。