hailin
/
rwadurian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,585 Commits 1 Branch 10 Tags 183 MiB
Commit Graph

16 Commits

Author SHA1 Message Date
hailin 5adcd023e6 fix(pricing): 修复 priceSupplement 在 Kafka 事件链中丢失的问题 
## 问题描述

认种树动态定价涨价功能 (ed6b48562) 在 planting-service 的资金分配
中正确计算了 HQ_PRICE_SUPPLEMENT，但 priceSupplement 字段未随
Kafka 事件传递到 reward-service，导致 reward-service 的
calculateHqPriceSupplement 永远收到 priceSupplement=0，涨价部分
的总部奖励分配不会执行。

## 事件链路径 (修复前 → 修复后)

  planting-service (contract-signing.service.ts)
    ↓ contract.signed / contract.expired
    ↓ 修复前: 不含 priceSupplement ❌
    ↓ 修复后: 携带 order.priceSupplement ✅
  referral-service (contract-signing.handler.ts)
    ↓ planting.order.paid / planting.order.expired
    ↓ 修复前: 不含 priceSupplement ❌
    ↓ 修复后: 透传 eventData.priceSupplement || 0 ✅
  reward-service (event-consumer.controller.ts)
    ↓ calculateHqPriceSupplement(priceSupplement)
    ↓ 修复前: 始终为 0，不分配 ❌
    ↓ 修复后: 收到实际值，正确分配给 S0000000001 ✅

## 修改文件

1. planting-service/src/infrastructure/kafka/event-publisher.service.ts
   - ContractSigningEventData 接口新增 priceSupplement?: number 字段

2. planting-service/src/application/services/contract-signing.service.ts
   - signContract(): publishContractSigned 时传递 order.priceSupplement
   - handleExpiredTasks(): publishContractExpired 时传递 order.priceSupplement

3. referral-service/src/application/event-handlers/contract-signing.handler.ts
   - ContractSigningEvent 接口新增 priceSupplement?: number 字段
   - publishOrderPaidEvent(): 透传 priceSupplement 到 planting.order.paid
   - publishOrderExpiredEvent(): 透传 priceSupplement 到 planting.order.expired

## 向后兼容

- priceSupplement 为可选字段 (?: number)，默认 fallback 为 0
- 已存在的订单 priceSupplement=0，不影响现有分配逻辑
- reward-service event-consumer 已有 || 0 fallback 保护

## 验证方法

1. 设置 supplement > 0 后创建认种订单
2. 签署合同后检查 reward-service 日志是否有 HQ_PRICE_SUPPLEMENT 分配记录
3. 检查总部账户 S0000000001 是否收到 priceSupplement * treeCount 的入账

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-02-26 07:13:01 -08:00
hailin b3a3652f21 feat(transfer): 树转让功能全量实现（纯新增，零侵入） 
实现已认种果树所有权在用户间转让的完整功能。采用方案一：
独立 transfer-service 微服务 + Saga 编排器模式。

=== 架构设计 ===
- Saga 编排器 8 步正向流程：卖方确认 → 冻结资金 → 锁定树 →
  变更所有权 → 调整算力 → 更新统计 → 结算资金 → 完成
- 补偿回滚：任一步骤失败自动反向补偿（解冻资金 → 解锁树）
- 13 种状态：PENDING → SELLER_CONFIRMED → PAYMENT_FROZEN →
  TREES_LOCKED → OWNERSHIP_TRANSFERRED → CONTRIBUTION_ADJUSTED →
  STATS_UPDATED → PAYMENT_SETTLED → COMPLETED / CANCELLED /
  FAILED / ROLLING_BACK / ROLLED_BACK

=== Phase 1-2: transfer-service（独立微服务） ===
新建文件：
- Prisma Schema：transfer_orders + transfer_status_logs + outbox_events
- Domain：TransferOrder 聚合根 + TransferFeeService（5% 手续费）
- Application：TransferApplicationService + SagaOrchestratorService
- Infrastructure：Kafka 事件消费/生产 + Outbox Pattern
- API：TransferController（用户端）+ AdminTransferController（管理端）
- External Clients：wallet/planting/identity-service HTTP 客户端
- Docker + 环境配置

=== Phase 3: 现有微服务扩展（纯追加） ===
planting-service：
- Prisma schema 追加 transferLockId 可空字段
- InternalTransferController：锁定/解锁/执行 3 个新端点
- Kafka handlers：transfer-lock/execute/rollback 事件处理
- main.ts 追加 Kafka consumer group 配置

referral-service：
- PlantingTransferredHandler：处理转让后团队统计更新
- TeamStatisticsAggregate 追加 handleTransfer() 方法
- TeamStatisticsRepository 追加 adjustForTransfer() 方法
- ProvinceCityDistribution 追加 transferTrees() 方法

contribution-service：
- TransferOwnershipHandler：处理所有权变更事件
- TransferAdjustmentService：算力调整（879 行核心逻辑）
- Prisma schema 追加 transferOrderId 可空字段
- ContributionAccount 追加 applyTransferAdjustment() 方法

=== Phase 4A: wallet-service（3 个新内部端点） ===
新建文件：
- FreezeForTransferDto / UnfreezeForTransferDto / SettleTransferDto
- FreezeForTransferCommand / UnfreezeForTransferCommand / SettleTransferPaymentCommand
- InternalTransferWalletController（POST freeze/unfreeze/settle-transfer）

修改文件：
- wallet-application.service.ts 追加 3 组方法（+437 行）：
  freezeForTransfer / unfreezeForTransfer / settleTransferPayment
  （乐观锁 + 3 次重试 + Prisma $transaction + 幂等检查）
- 结算操作：单事务内更新 3 个钱包（买方扣减 + 卖方入账 + 手续费归集）

=== Phase 4B: admin-web（转让管理页面） ===
新建文件：
- transferService.ts：API 调用服务 + 完整类型定义
- useTransfers.ts：React Query hooks（list/detail/stats/forceCancel）
- /transfers/page.tsx：列表页（统计卡片 + 搜索筛选 + 分页 + 13 种状态 badge）
- /transfers/[transferOrderNo]/page.tsx：详情页（Saga 时间线 + 状态日志 + 强制取消）
- transfers.module.scss：完整样式

修改文件：
- endpoints.ts 追加 TRANSFERS 端点配置
- Sidebar.tsx 追加「转让管理」菜单项
- hooks/index.ts 追加 useTransfers 导出

=== Phase 4C: mobile-app（转让 UI） ===
新建文件：
- transfer_service.dart：Flutter API 服务 + Model（TransferOrder/Detail/StatusLog）
- transfer_list_page.dart：转让记录列表（全部/转出/转入 Tab + 下拉刷新）
- transfer_detail_page.dart：转让详情（Saga 时间线 + 确认/取消操作）
- transfer_initiate_page.dart：发起转让表单（手续费自动计算）

修改文件：
- injection_container.dart 追加 transferServiceProvider
- route_paths.dart + route_names.dart 追加 3 个路由
- app_router.dart 追加 3 个 GoRoute
- profile_page.dart 追加「发起转让」+「转让记录」按钮行

=== 基础设施 ===
- docker-compose.yml 追加 transfer-service 容器配置
- deploy.sh 追加 transfer-service 部署
- init-databases.sh 追加 transfer_db 数据库初始化

=== 纯新增原则 ===
所有变更均为追加式修改，不修改任何现有业务逻辑：
- 新增 nullable 字段（不影响现有数据）
- 新增 enum 值（不影响现有枚举使用）
- 新增 providers/controllers（不影响现有依赖注入）
- 新增页面/路由（不影响现有页面行为）

回滚方式：删除 transfer-service 目录 + 移除各服务中带 [2026-02-19] 标记的代码

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-02-19 03:44:02 -08:00
hailin 7d3483b565 fix(referral-service): 修复 Kafka 消费异常被吞掉的问题 
- kafka.service.ts: 抛出异常让 KafkaJS 触发重试
- user-registered.handler.ts: 传播异常到 KafkaService

修复前处理失败的消息不会重试，导致推荐关系可能丢失

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2026-01-07 18:47:05 -08:00
hailin 714ce42e4f feat(contract-signing): 添加电子合同签署功能及单点配置优化 
- planting-service: 添加合同签署任务管理和超时检测
  - 新增 ContractSigningTask 领域模型
  - 添加 24 小时合同签署超时定时任务
  - 支付后资金保持冻结，由 referral-service 统一确认扣款

- referral-service: 单点配置 CONTRACT_SIGNING_ENABLED
  - 新增 ContractSigningHandler 处理合同签署/超时事件
  - 新增 WalletServiceClient 调用钱包服务确认扣款
  - planting.created 处理后根据配置决定是否等待合同签署

- reward-service: 移除 CONTRACT_SIGNING_ENABLED 配置
  - 扣款确认由 referral-service 在发送事件前完成
  - 保持奖励分配逻辑不变

配置说明:
- CONTRACT_SIGNING_ENABLED=true (默认): 等待合同签署后分配奖励
- CONTRACT_SIGNING_ENABLED=false: 立即分配奖励（原有流程）

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-24 20:12:12 -08:00
hailin 7d95a35204 fix(referral): 团队统计使用accountSequence替代userId 
- UpdateTeamStatisticsCommand 改用 accountSequence
- PlantingCreatedHandler 传递 accountSequence
- TeamStatisticsService 使用 findByAccountSequence 查询
- 修复上家团队认种数不正确的问题

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-14 05:46:11 -08:00
hailin 98d8bee20d fix: 统一推荐码生成逻辑 - 由 identity-service 单点生成 
重要变更:
- identity-service 生成用户推荐码，通过 Kafka 事件传递给 referral-service
- referral-service 不再自己生成推荐码，直接使用事件中的推荐码
- 修复两个服务推荐码不一致的问题

涉及服务:
- identity-service: 事件 payload 添加 referralCode 字段
- referral-service: 接收并存储 identity-service 生成的推荐码
- wallet-service: 添加区域账户动态创建接口
- planting-service: 调用区域账户创建接口

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-13 01:14:56 -08:00
hailin ebbf2d971a feat: 跨服务使用 accountSequence 查询推荐链 + 系统账户动态创建 
1. reward-service 使用 accountSequence 查询推荐链
   - event-consumer.controller.ts: 优先使用 accountSequence 作为用户标识
   - reward-calculation.service.ts: 使用 accountSequence 查询推荐关系
   - referral-service.client.ts: 参数从 userId 改为 accountSequence

2. referral-service 支持 accountSequence 格式的推荐链查询
   - referral.controller.ts: /chain/:identifier 同时支持 userId 和 accountSequence

3. wallet-service 系统账户动态创建
   - wallet-application.service.ts: allocateToUserWallet 使用 getOrCreate
   - 支持省区域(9+code)和市区域(8+code)账户自动创建
   - 新增 migration seed: 4个固定系统账户 (S0000000001-S0000000004)

4. planting-service 事件增强
   - 事件中添加 accountSequence 字段用于跨服务关联

系统账户格式:
- S0000000001: 总部社区 (基础费9U + 兜底权益)
- S0000000002: 成本费账户 (400U)
- S0000000003: 运营费账户 (300U)
- S0000000004: RWAD底池账户 (800U)
- 9+provinceCode: 省区域系统账户 (动态创建)
- 8+cityCode: 市区域系统账户 (动态创建)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-12 23:22:01 -08:00
hailin 75c49951b7 fix: 修复多个服务的 accountSequence 类型和推荐关系 bug 
1. referral-service: 修复 userId 从临时值 0 导致的 "用户ID必须大于0" 错误
   - 从 accountSequence 提取数值部分作为 userId (去掉 "D" 前缀)
   - 避免依赖 identity-service 发送的临时 userId

2. 多服务 migration 修复: accountSequence/inviterSequence 类型从 BIGINT 改为 VARCHAR(12)
   - identity-service: account_sequence, inviter_sequence
   - authorization-service: account_sequence
   - blockchain-service: account_sequence
   - referral-service: account_sequence
   - reward-service: account_sequence
   - backup-service: account_sequence

3. mpc-service 与 backup-service 集成:
   - mpc-service: 添加 BACKUP_SERVICE_URL, BACKUP_SERVICE_ENABLED, SERVICE_JWT_SECRET
   - backup-service: ALLOWED_SERVICES 添加 mpc-service

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-12 12:29:11 -08:00
hailin 4be9c1fb82 refactor!: 重构账户序列号格式 (BREAKING CHANGE) 
将 accountSequence 从数字类型改为字符串类型，新格式为:
- 普通用户: D + YYMMDD + 5位序号 (例: D2512120001)
- 系统账户: S + 10位序号 (例: S0000000001)

主要变更:
- identity-service: AccountSequence 值对象改为字符串类型
- identity-service: 序列号生成器改为按日期重置计数
- 所有服务: Prisma schema 字段类型从 BigInt/Int 改为 String
- 所有服务: DTO、Command、Event 中的类型定义更新
- Flutter 前端: 相关数据模型类型更新

涉及服务:
- identity-service (核心变更)
- referral-service
- authorization-service
- wallet-service
- reward-service
- blockchain-service
- backup-service
- planting-service
- mpc-service
- admin-service
- mobile-app (Flutter)

注意: 此为破坏性变更，需要清空数据库并重新运行 migration

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-12 09:11:18 -08:00
hailin 8148d1d127 fix: 修复权益分配竞态条件和统计数据bug 
1. 事件流重构：将 planting.order.paid 事件从 planting-service 移至 referral-service 发送
   - 确保统计数据更新后再触发奖励计算，避免竞态条件
   - planting-service 只发送 planting.planting.created 事件（包含订单信息）
   - referral-service 处理完统计更新后转发 planting.order.paid 给 reward-service

2. 修复 addPersonalPlanting 方法：
   - 原代码错误地更新 _totalTeamCount（团队人数）而非 _teamPlantingCount（团队认种数）
   - 导致 subordinateTeamPlantingCount 计算错误，权益无法正确分配

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-12 05:35:31 -08:00
hailin 62a21b73a5 fix(referral): use accountSequence instead of userId for user registration events 
identity-service sends userId=0 in events (temp value before DB save),
use accountSequence as the unique identifier instead
 2025-12-10 13:29:36 -08:00
hailin 70d1a8bfb8 fix(referral): add idempotency check for Kafka event processing 
- Add processed_events table to track handled events
- Check eventId before processing planting.created events
- Skip duplicate events and still send ACK to stop retries

This prevents data accumulation when Kafka events are redelivered
due to ACK failures or consumer timeouts.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-10 09:38:13 -08:00
hailin 014ad9d19f feat(planting): implement Outbox Pattern with consumer acknowledgment (B方案) 
Implement reliable event delivery using Outbox Pattern with consumer confirmation:

## planting-service (Producer)
- Add OutboxEvent table with status: PENDING → SENT → CONFIRMED
- Add OutboxRepository with transaction support and timeout handling
- Add OutboxPublisherService with polling, timeout check, and retry
- Add EventAckController to receive consumer confirmations
- Update UnitOfWork to save outbox events atomically with business data
- Update PlantingApplicationService to use outbox pattern
- Update PoolInjectionService to use outbox pattern

## Consumer Services
- Add EventAckPublisher to reward-service, referral-service, authorization-service
- Update event handlers to send acknowledgment after successful processing

## Event Flow
1. Business data + outbox events saved in same transaction
2. OutboxPublisher polls and sends to Kafka, marks as SENT
3. Consumer processes event and sends ack to planting.events.ack
4. EventAckController receives ack and marks as CONFIRMED
5. Timeout check resets SENT→PENDING for retry (max 5 times)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-09 21:32:16 -08:00
hailin 5d671bf5ec feat(referral): integrate referral system with identity-service and mobile-app 
## Backend Changes

### referral-service
- Add accountSequence field to ReferralRelationship aggregate for cross-service user identification
- Add findByAccountSequence() method to repository interface and implementation
- Update CreateReferralRelationshipCommand to accept accountSequence and inviterAccountSequence
- Modify ReferralService to support looking up inviter by accountSequence
- Update event handler to listen to identity.UserAccountAutoCreated and identity.UserAccountCreated topics
- Add initial database migration with all tables including accountSequence field
- Update DTO and controller to support new parameters

### identity-service
- Add inviterSequence field to MeResult interface
- Update getMe() method to return inviterSequence from user account
- Update MeResponseDto to include inviterSequence field

## Frontend Changes (mobile-app)

### API & Storage
- Add /me endpoint constant in api_endpoints.dart
- Add inviterSequence key in storage_keys.dart
- Add MeResponse and WalletAddressInfo classes in account_service.dart
- Add getMe() method to fetch complete user info including inviter
- Add getInviterSequence() method to retrieve from local storage

### Profile Page
- Update profile_page.dart to load referrer info from API
- Add _loadMeData() method to call getMe() API
- Display inviterSequence (referrer serial number) dynamically

## Flow Summary
1. User creates account with optional inviterReferralCode
2. identity-service validates and saves inviterSequence
3. identity-service publishes UserAccountAutoCreated/UserAccountCreated event
4. referral-service listens and creates referral relationship using inviterAccountSequence
5. Mobile app calls GET /me to display inviter info in profile page

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-08 22:37:06 -08:00
hailin 747e4ae8ef refactor(mpc-system): migrate to party-driven architecture with PartyID-based routing 
- Remove Address field from PartyEndpoint (parties connect to router themselves)
- Update K8s Discovery to only manage PartyID and Role labels
- Add Party registration and SessionEvent protobuf definitions
- Implement PartyRegistry and SessionEventBroadcaster domain logic
- Add RegisterParty and SubscribeSessionEvents gRPC handlers
- Prepare infrastructure for party-driven MPC coordination

This is the first phase of migrating from coordinator-driven to party-driven
architecture following international MPC system design patterns.
 2025-12-05 08:11:28 -08:00
Developer 7ae98c7f5b feat(referral-service): Implement complete referral service with DDD architecture 
Implement the referral service microservice with comprehensive features:

## Domain Layer
- ReferralRelationship aggregate: manages user referral relationships
- TeamStatistics aggregate: tracks team statistics and leaderboard scores
- Value Objects: UserId, ReferralCode, ReferralChain, LeaderboardScore, ProvinceCityDistribution
- Domain Services: ReferralChainService, LeaderboardCalculationService
- Domain Events: ReferralRelationshipCreated, TeamStatisticsUpdated

## Application Layer
- ReferralService: create relationships, get user info, validate codes
- TeamStatisticsService: update statistics, get leaderboard, province/city distribution
- Commands: CreateReferralRelationship, UpdateTeamStatistics
- Queries: GetUserReferralInfo, GetDirectReferrals, GetLeaderboard, GetProvinceCityDistribution
- Event Handlers: UserRegisteredHandler, PlantingCreatedHandler

## Infrastructure Layer
- Prisma repositories with PostgreSQL
- Redis caching for leaderboard
- Kafka messaging for domain events
- JWT authentication guard

## API Layer
- REST endpoints for referral management
- Leaderboard endpoints with pagination
- Team statistics endpoints
- Health check endpoints

## Testing (127 unit + 35 integration + 16 E2E tests)
- Domain layer unit tests (100% coverage)
- Integration tests with mocks
- E2E tests with supertest
- Docker test environment with PostgreSQL, Redis, Redpanda

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-01 00:18:20 -08:00