Compare commits

...

60 Commits
v1.5.1 ... main

Author SHA1 Message Date
李东云
633bf585e1 build: 换成satis 2025-12-24 16:01:35 +08:00
李东云
0573ff595f chore(release): 1.13.2 2025-12-24 15:26:41 +08:00
李东云
72004d3916 chore(release): 1.13.1 2025-12-24 14:11:33 +08:00
李东云
7ade038f0f fix(ProductRepo): 将isset检查改为!empty检查以确保数据有效性 2025-12-24 14:11:13 +08:00
李东云
175a170dec chore(release): 1.13.0 2025-12-02 17:59:45 +08:00
李东云
19e95016fa feat(发票): 为发送发票接口添加可选邮箱参数
在发送发票接口中添加可选的邮箱参数,允许指定接收发票的邮箱地址。当不指定邮箱时,保持原有行为不变。
2025-12-02 17:59:18 +08:00
李东云
6fd7f2f421 chore(release): 1.12.4 2025-12-02 16:05:11 +08:00
李东云
1d1cdd7829 fix(invoice): 修正发票金额计算逻辑
- 将金额乘以100改为除以100以获得正确的数值
- 确保货币金额在存储前被正确转换为浮点数
- 保留两位小数精度以匹配财务数据标准
2025-12-02 16:04:53 +08:00
李东云
98fa6262a9 chore(release): 1.12.3 2025-12-01 15:32:07 +08:00
李东云
7d836f50df chore(release): 1.12.2 2025-12-01 15:18:19 +08:00
李东云
0452910354 chore(release): 1.12.1 2025-12-01 15:00:34 +08:00
李东云
28b81f427e feat(Invoice): 添加价格和货币信息到发票信息
- 在 InvoiceInfo 类中添加 price 和 currencySymbol 属性,并提供相关获取方法
- 修改 InvoiceRepo 以适配新的 InvoiceInfo 结构
2025-12-01 15:00:07 +08:00
李东云
46da805cb4 fix(InvoiceRepo): 修复InvoiceProduct构造函数缺少prices参数的问题
添加PointPrice数组参数到InvoiceProduct构造函数调用中,确保API响应中的价格数据被正确处理。同时添加必要的类导入声明。
2025-12-01 14:04:36 +08:00
李东云
f0550c4272 chore(release): 1.12.0 2025-11-28 18:26:10 +08:00
李东云
cae728b392 feat(账户): 添加邮箱管理功能并重构账户仓库
- 创建 Email 值对象用于封装邮箱信息
- 扩展 AccountRepoInterface 添加邮箱管理方法
- 重命名 AccountBalanceRepo 为 AccountRepo 并实现邮箱功能
- 更新相关测试用例和配置以适配新功能
2025-11-28 18:25:52 +08:00
李东云
6bc423417c refactor: 适配项目目录结构从 app/ 改为 src/
修改 run-in-docker.sh 项目名以保持一致性
更新测试脚本和 composer.json 中的目录引用
添加项目文档和计划文件
2025-11-28 18:07:48 +08:00
李东云
cb938d6130 feat: 添加 run-in-docker.sh 脚本用于在容器中运行命令
添加新的脚本文件 run-in-docker.sh,用于检查并启动 Docker 容器,并在容器内执行指定命令。脚本会自动处理容器的启动和端口分配,简化开发环境中的命令执行流程。
2025-11-28 18:01:41 +08:00
李东云
327066b146 ci: 添加测试相关的CI脚本
添加多个测试脚本用于CI流程,包括完整CI流程、Phpspec测试、静态分析、所有测试、代码风格修复与检查以及单元测试
2025-11-28 17:59:33 +08:00
李东云
e92a6f46a4 chore(release): 1.11.1 2025-11-27 16:01:04 +08:00
李东云
e0748e444b chore(release): 1.11.0 2025-11-27 11:52:19 +08:00
李东云
244dd1220a feat(invoice): 添加发票金额和货币支持
- 在 CreateInvoiceCmd 中新增 price 和 currencySymbol 字段
- 在 Invoice 聚合根中集成 Money 对象并添加相关方法
- 更新 InvoiceRepo 以处理价格数据的序列化与反序列化
- 在测试中增加对新字段的验证
2025-11-27 11:51:46 +08:00
李东云
8a9971bc59 chore(release): 1.10.0 2025-11-25 16:01:52 +08:00
李东云
4c5dde9020 feat(invoice): 引入点数价格值对象并更新发票产品结构
- 新增 PointPrice 值对象用于表示金额与货币符号
- 修改 InvoiceProduct 结构以支持多个 PointPrice 实例
- 更新 InvoiceProductRepo 以映射数据库中的价格数据
- 在测试中验证 prices 字段的正确性和类型安全
2025-11-25 16:01:25 +08:00
李东云
1cb20a7c7e test(product): 移除测试中的 only 标记
- 移除了 QueryPointRateTest 中两个测试用例的 only 标记
- 确保所有测试用例都能正常执行
- 避免因 only 标记导致其他测试被跳过
2025-11-25 15:30:06 +08:00
李东云
028721feb1 chore(deps): 移除 Carbon 依赖包
- 从 composer.json 中移除了 nesbot/carbon 依赖
- 保留了 swoole/ide-helper 依赖包
- 更新了依赖包列表格式以保持整洁
2025-11-25 14:54:22 +08:00
李东云
bd00102081 chore(release): 1.9.7 2025-10-30 15:19:26 +08:00
李东云
7763b088df feat(account): 添加4D X无限奖励积分类型
- 在PointType枚举中新增FourDXUnlimitedBonusCredits类型
- 更新values方法以包含新的积分类型值
2025-10-30 15:19:18 +08:00
李东云
cd56a6214b chore(release): 1.9.6 2025-09-19 16:48:36 +08:00
李东云
31559fdf5d refactor(Domain): 重构 ExchangeRepoInterface 接口
-将 getRate 方法的 $uid 参数类型从 string 改为 ?string
2025-09-19 16:48:31 +08:00
李东云
41d768ba82 chore(release): 1.9.5 2025-09-19 16:42:28 +08:00
李东云
c552dd8ed0 refactor(ProductRepo): 优化 getRate 方法参数处理
- 将 getRate 方法的 $uid 参数变更为可选参数
- 使用 array_filter 过滤空值,避免在请求中发送不必要的参数
- 增加了两个单元测试用例,分别测试不带 uid 和带 uid 的情况
2025-09-19 16:41:26 +08:00
李东云
e7e1c7f6c9 refactor(domain): 更新汇率接口并添加 UID 参数
- 在 ExchangeRepoInterface 中添加了 uid 参数
- 在 ProductRepo 中实现了 getRate 方法,增加了 uid 参数
- 更新了单元测试,添加了 uid 参数
2025-09-19 16:39:09 +08:00
李东云
7e0d711e99 chore(release): 1.9.4 2025-09-19 15:35:43 +08:00
李东云
eb44b6e3b6 fix(product): 修复产品列表中点数显示问题
- 在 RechargeProductsDto 类中,修改了 bonus_rate_pct 的计算方式
- 使用 round 函数对结果进行四舍五入,提高精度
- 调整 scale 参数为3,增加小数位数- 这些修改提高了点数计算的准确性,解决了产品列表中的点数显示问题
2025-09-19 15:35:27 +08:00
李东云
3af39e4254 chore(release): 1.9.3 2025-09-19 10:17:29 +08:00
李东云
8bbc8ed629 feat(PointType): 添加 ScanToModel 作为点类型
在 PointType 枚举中添加了新的点类型 ScanToModel,以支持新的扫描建模功能。
2025-09-19 10:17:21 +08:00
李东云
48e6fafe8e chore(release): 1.9.2 2025-09-19 09:45:32 +08:00
李东云
874a6f4fa9 feat(Account): 添加新的积分类型
- 新增 ScanToModel 积分类型
- 用于奖励完成扫描取模的用户
2025-09-19 09:45:18 +08:00
李东云
8ac850fc62 chore(release): 1.9.1 2025-09-17 20:35:04 +08:00
李东云
8f8f7b08b0 fix(account): 修复初始账户命令和测试
- 修改 InitialAccountCmd 类的属性和方法
- 更新 addPointsBalance 方法的参数和返回值
- 调整测试数据和测试逻辑以适应新的命令结构
2025-09-17 20:34:51 +08:00
李东云
203dd34353 chore(release): 1.9.0 2025-09-17 20:04:00 +08:00
李东云
87b09ef34c feat(account): 添加初始化账户余额功能
- 新增 InitialAccountCmd 类用于处理初始账户命令
- 在 AccountRepoInterface 接口中添加 initial 方法
- 实现 AccountBalanceRepo 类中的 initial 方法
- 添加单元测试 InitialAccountBalanceTest 以验证初始化功能
2025-09-17 20:03:45 +08:00
李东云
a59d979076 chore(release): 1.8.2 2025-09-17 14:41:12 +08:00
李东云
686d835a91 fix(ProductRepo): 修复产品仓库中的数组为空的处理逻辑
- 优化了 one_time、package 和 plan 数据的处理方式
- 使用 array_map 函数替代循环,提高代码可读性
- 增加空值合并运算符 ??,提高代码健壮性
-调整代码格式,提高代码整洁度
2025-09-17 14:40:56 +08:00
李东云
65b060e5d3 chore(release): 1.8.1 2025-09-06 03:06:53 +08:00
李东云
3b12216344 feat(PointLog): 添加获取病人姓名的方法并更新相关代码
- 在 PointLog 类中添加 patientName属性和 getPatientName() 方法
- 更新 PointLogRepo 类,从数据库中获取并设置 patient_name 字段
2025-09-06 03:06:43 +08:00
李东云
7354abb99a chore(release): 1.8.0 2025-09-05 19:02:29 +08:00
李东云
93f923181c feat(invoice): 添加发票详情查询功能
- 新增 InvoiceInfo 类封装发票信息
- 新增 PointBalance 类封装积分余额信息
- 在 InvoiceRepoInterface 接口中添加 findOne 方法
- 在 InvoiceRepo 类中实现 findOne 方法,用于查询单张发票详情
- 添加单元测试验证 findOne 方法的功能
2025-09-05 19:02:13 +08:00
李东云
fb3327b252 chore(release): 1.7.0 2025-09-04 17:26:12 +08:00
李东云
975a5ee301 feat(account): 增加积分日志详情查询功能并支持发票信息
- 新增 InvoiceRecord 类用于存储发票信息
- 在 PointLog 类中添加发票相关字段和方法
- 在 PointLogRepo 中实现积分日志详情查询接口
- 更新单元测试以覆盖新功能
2025-09-04 17:25:57 +08:00
李东云
580c2f6ca0 chore(release): 1.6.1 2025-09-04 15:45:09 +08:00
李东云
15c0ecb6fe feat(invoice): 添加发票下载和发送功能
- 在 InvoiceRepoInterface 中新增了 download 和 send 方法的接口
- 在 InvoiceRepo 类中实现了 download 和 send 方法
- 优化了 create 方法的文档注释
2025-09-04 15:44:56 +08:00
李东云
fb54e19366 chore(release): 1.6.0 2025-09-04 15:12:03 +08:00
李东云
366f1d64ad feat(invoice): 添加发票下载功能并优化测试
- 在 InvoiceRepo 中实现 download 方法,用于下载发票 PDF
- 在 CreateInvoiceTest 中添加发票下载测试用例
- 优化测试用例的编写方式,提高可读性
2025-09-04 15:11:39 +08:00
李东云
72f7d37382 feat(invoice): 添加发票发送功能并进行测试
- 在 InvoiceRepo 中添加 send 方法,用于发送发票邮件
- 在 CreateInvoiceTest 中添加测试用例,验证发票发送功能
2025-09-04 15:06:23 +08:00
李东云
2a40b3b219 chore(release): 1.5.3 2025-09-04 11:30:35 +08:00
李东云
86f375b18a refactor(PointLogRepo): 优化 getList 方法参数类型
- 将 $type 参数类型从 string 改为 PointType 枚举
- 使用 isset 和 null 合并条件表达式简化代码
2025-09-04 11:30:30 +08:00
李东云
8a70e35de7 refactor(invoice): 重构发票创建流程和积分日志接口
- 移除 CreateInvoiceCmd 中的 uid 字段
- 更新 InvoiceRepo 中的 create 方法,移除 URL 中的 uid
- 修改 PointLogRepo 中的 getList 方法,增加 type 参数并更新 API 调用
- 更新相关测试文件以适应这些变更
2025-09-04 11:28:26 +08:00
李东云
06a198714e chore(release): 1.5.2 2025-09-02 10:25:01 +08:00
李东云
c2358ae19b fix(AccountBalanceRepo): 修复积分余额过期时间解析
- 在 PointsBalance 类中,将 expiredAt 字段的类型从字符串改为 Carbon 对象
- 优化了对 expiredAt 字段的处理逻辑,增加了空值判断
2025-09-02 10:24:48 +08:00
50 changed files with 7655 additions and 639 deletions

View File

@@ -0,0 +1,19 @@
# 生成 llm.txt 文件计划
## 任务目标
阅读整个项目,并生成 llm.txt 文件,总结项目的结构、功能和技术栈。
## 实现步骤
1. 退出计划模式,进入执行模式
2. 生成 llm.txt 文件,包含以下内容:
- 项目基本信息
- 技术栈
- 项目架构
- 核心功能模块
- 主要领域模型
- RPC 服务
- 配置说明
3. 确保文件内容全面、准确地反映项目结构和功能
## 预期结果
生成一个完整的 llm.txt 文件,包含项目的所有重要信息,便于后续参考和使用。

View File

@@ -0,0 +1,52 @@
# 脚本适配计划
## 任务目标
根据 `/Users/weili/Projects/HDK/Pay/scripts/docker-env.sh` 参考,适配从 LuxPay 项目复制过来的脚本,包括 `run-in-docker.sh``scripts/test/` 下的所有测试脚本。
## 适配分析
### 1. 脚本文件分析
#### 1.1 run-in-docker.sh
- 功能:在 Docker 容器中运行命令
- 镜像:`harbor.luxcreo.cn/library/hyperf:8.2-swoole`
- 项目名:`lux-pay-run`
- 行为:检查容器是否运行,如未运行则启动后台容器
#### 1.2 scripts/docker-env.sh参考
- 功能:启动交互式 Docker 容器
- 镜像:`harbor.luxcreo.cn/library/hyperf:8.2-swoole`
- 项目名:`hdk-pay`
- 行为:直接启动交互式容器,退出后容器删除
#### 1.3 测试脚本
- 所有脚本都使用 `./run-in-docker.sh` 运行命令
- 代码风格检查和修复脚本使用 `app/` 目录,但本项目使用 `src/`
- 静态分析脚本使用 `app/` 目录,需要改为 `src/`
- `phpspec-tests.sh` 可能不需要,因为本项目使用 PHPUnit/Pest
### 2. 适配方案
#### 2.1 适配 run-in-docker.sh
- 保持基本功能不变
- 考虑使用与参考脚本一致的项目名 `hdk-pay`
- 确保容器配置与参考脚本兼容
#### 2.2 适配测试脚本
- 修改 `code-style-check.sh``code-style-fix.sh`:将 `app/` 改为 `src/`
- 修改 `static-analysis.sh`:将 `app/` 改为 `src/`
- 检查 `phpspec-tests.sh`:如不需要则删除
- 确保所有脚本使用正确的目录结构
#### 2.3 适配 composer.json 脚本
- 修改 `analyse` 脚本:将 `./app` 改为 `./src`
## 执行步骤
1. 适配 `run-in-docker.sh` 脚本
2. 适配 `scripts/test/` 下的所有测试脚本
3. 适配 `composer.json` 中的脚本配置
4. 测试脚本是否能正常运行
## 预期结果
所有脚本都能正确适配本项目,使用正确的目录结构和 Docker 环境,能够正常执行各种测试和代码质量检查任务。

View File

@@ -0,0 +1,83 @@
# 邮箱管理 SDK 生成计划(最终版本)
## 任务目标
根据 OpenAPI 规范,生成“获取用户常用邮箱”和“更新用户常用邮箱”接口的 SDK严格遵循 DDD 架构,不创建新的 Rpc 文件,创建独立的邮箱管理仓库或合理命名现有仓库。
## 分析与设计
### 1. 接口分析
从 OpenAPI 规范中,我找到了两个邮箱管理相关接口:
- **GET /rpc/v2/account/{uid}/inv-email**:获取用户常用邮箱
- **PUT /rpc/v2/account/{uid}/inv-email**:更新用户常用邮箱
### 2. 现有代码结构DDD 架构)
- **Domain 层**
- `AccountRepoInterface`:账户仓库接口
- `AccountBalance``PointsBalance`:账户相关聚合根和值对象
- `PointType``PointAction`:枚举类
- **Infrastructure 层**
- `AccountBalanceRepo`:实现了 `AccountRepoInterface`,但名称仅反映余额管理
- `AbstractRepo`:基础仓库类,封装了 HTTP 请求
### 3. 实现方案
#### 3.1 方案选择
考虑到用户反馈,我选择以下方案:
- **扩展 AccountRepoInterface**:添加邮箱管理方法
- **创建新的 AccountRepo 实现**:将 AccountBalanceRepo 重命名为 AccountRepo使其更通用
- **创建 Email 领域对象**:创建 Email 值对象封装邮箱信息
#### 3.2 具体设计
1. **创建 Email 领域对象**
- `Email`:值对象,封装邮箱信息
2. **扩展 AccountRepoInterface**
- `getEmail`:获取用户常用邮箱,返回 `Email` 对象
- `updateEmail`:更新用户常用邮箱,接收 `Email` 对象
3. **重命名并扩展 AccountBalanceRepo**
-`AccountBalanceRepo` 重命名为 `AccountRepo`
- 实现新添加的邮箱管理方法
- 保持原有余额管理功能不变
## 执行步骤
1. **创建 Email 领域对象**
-`Domain/Account/ValueObject` 目录下创建 `Email.php`
2. **扩展 AccountRepoInterface**
- 添加 `getEmail``updateEmail` 方法
3. **重命名并扩展 AccountBalanceRepo**
-`AccountBalanceRepo` 重命名为 `AccountRepo`
- 实现邮箱管理方法
4. **更新 ConfigProvider**
- 更新依赖注入配置,将 `AccountRepoInterface` 指向新的 `AccountRepo`
5. **编写测试用例**
- 验证邮箱管理功能
## 预期结果
- 完成邮箱管理相关接口的 SDK 实现
- 严格遵循 DDD 架构,不创建新的 Rpc 文件
- 仓库名称更合理,支持账户的多种操作(余额和邮箱)
- 创建了 Email 领域对象,封装邮箱信息
- 代码结构符合项目现有规范
- 包含必要的测试用例
## 技术细节
- 使用现有的 `AbstractRepo` 作为基础类
- 使用 `RequestService` 进行 HTTP 请求
- 遵循项目现有的代码风格和命名规范
- 使用 PHP 8.2 的特性(如 readonly 属性、命名参数)
- 保持与现有代码的一致性
## 命名调整说明
-`AccountBalanceRepo` 重命名为 `AccountRepo`,使其更通用,能够处理账户相关的多种操作,包括余额和邮箱管理
- 创建 `Email` 值对象,封装邮箱信息,符合 DDD 领域驱动设计原则

View File

@@ -0,0 +1,66 @@
## 修复计划
### 问题分析
`/Users/weili/Projects/HDK/Pay/src/Infrastructure/Repository/InvoiceRepo.php` 第131-137行创建 `InvoiceProduct` 实例时缺少 `prices` 参数,导致构造函数调用失败。
### 错误原因
1. `InvoiceProduct` 类构造函数需要6个参数`caseId`, `uid`, `name`, `sku`, `description`, `prices`
2. 当前代码只传递了5个参数缺少 `prices` 参数
3. `prices` 参数是 `PointPrice[]` 类型的数组,不能为空
### 修复步骤
1. **添加必要的导入**
-`InvoiceRepo.php` 中添加 `Money``Currency` 类的导入
- 添加 `PointPrice` 类的导入
2. **处理API响应中的prices数据**
- 从API响应中提取 `prices` 数据(路径:`$result['product']['prices']`
- 遍历 `prices` 数据,为每个价格创建 `PointPrice` 实例
- 使用 `array_map` 函数简化处理过程
3. **完善InvoiceProduct实例创建**
- 将处理好的 `prices` 数组传递给 `InvoiceProduct` 构造函数
### 预期结果
- 修复后,`InvoiceRepo::getInvoiceInfo()` 方法能够成功创建 `InvoiceProduct` 实例
- 不再出现构造函数参数缺失的错误
- 代码能够正常运行,返回完整的 `InvoiceInfo` 对象
### 修复代码示例
```php
// 1. 在InvoiceRepo.php顶部添加必要的导入
use Money\Currency;
use Money\Money;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointPrice;
// 2. 在getInvoiceInfo()方法中完善InvoiceProduct实例创建
product: new InvoiceProduct(
caseId: $result['case_id'],
uid: $result['uid'],
name: $result['product']['name'],
sku: $result['product']['sku'],
description: $result['product']['description'],
prices: array_map(
callback: fn(array $price) => new PointPrice(
price: new Money(
amount: bcmul((string)$price['amount'], '100', 2),
currency: new Currency($price['currency']),
),
currencySymbol: $price['symbol'],
),
array: $result['product']['prices'],
),
),
```
### 检查结果
- 已检查所有使用 `InvoiceProduct` 的地方,只有 `InvoiceRepo.php` 中存在参数缺失问题
- `InvoiceProductRepo.php` 中的实现是正确的,可以作为参考
- 修复后,所有 `InvoiceProduct` 实例创建都会符合构造函数要求
### 测试建议
- 修复后,运行相关测试用例验证修复效果
- 可以使用 `./run-in-docker.sh APP_STATUS=false vendor/bin/pest --coroutine --prepend=tests/bootstrap.php` 运行测试
- 检查是否还有其他类似的构造函数参数问题

View File

@@ -1,4 +1,202 @@
# 版本更新日志
### [1.13.2](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.13.1...v1.13.2) (2025-12-24)
### [1.13.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.13.0...v1.13.1) (2025-12-24)
### 🐛 Bug Fixes | Bug 修复
* **ProductRepo:** 将isset检查改为!empty检查以确保数据有效性 ([7ade038](http://124.126.16.154:8888/singularity/hdk-pay/commit/7ade038f0fb1c6a857428d75667ccb2289d392fd))
## [1.13.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.12.4...v1.13.0) (2025-12-02)
### ✨ Features | 新功能
* **发票:** 为发送发票接口添加可选邮箱参数 ([19e9501](http://124.126.16.154:8888/singularity/hdk-pay/commit/19e95016fae1230cce88b3ead5c9ae2474bfdafc))
### [1.12.4](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.12.3...v1.12.4) (2025-12-02)
### 🐛 Bug Fixes | Bug 修复
* **invoice:** 修正发票金额计算逻辑 ([1d1cdd7](http://124.126.16.154:8888/singularity/hdk-pay/commit/1d1cdd7829942984f4dcdd16e7e0d1ba9ac9d1ce))
### [1.12.3](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.12.2...v1.12.3) (2025-12-01)
### [1.12.2](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.12.1...v1.12.2) (2025-12-01)
### [1.12.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.12.0...v1.12.1) (2025-12-01)
### 🐛 Bug Fixes | Bug 修复
* **InvoiceRepo:** 修复InvoiceProduct构造函数缺少prices参数的问题 ([46da805](http://124.126.16.154:8888/singularity/hdk-pay/commit/46da805cb41cdb777dbd9627a53f431e204904e2))
### ✨ Features | 新功能
* **Invoice:** 添加价格和货币信息到发票信息 ([28b81f4](http://124.126.16.154:8888/singularity/hdk-pay/commit/28b81f427e7ca618b0b1d561d83e107dcbba3c9c))
## [1.12.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.11.1...v1.12.0) (2025-11-28)
### 👷 Continuous Integration | CI 配置
* 添加测试相关的CI脚本 ([327066b](http://124.126.16.154:8888/singularity/hdk-pay/commit/327066b1466468ca76141e3b6c47183c5edbcb63))
### ♻️ Code Refactoring | 代码重构
* 适配项目目录结构从 app/ 改为 src/ ([6bc4234](http://124.126.16.154:8888/singularity/hdk-pay/commit/6bc423417cfa951073e993169c394063818ddd3d))
### ✨ Features | 新功能
* 添加 run-in-docker.sh 脚本用于在容器中运行命令 ([cb938d6](http://124.126.16.154:8888/singularity/hdk-pay/commit/cb938d61302e64119d67313073804a8f1c388352))
* **账户:** 添加邮箱管理功能并重构账户仓库 ([cae728b](http://124.126.16.154:8888/singularity/hdk-pay/commit/cae728b392e4ef14b70a3872f3ed6166995e57e5))
### [1.11.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.11.0...v1.11.1) (2025-11-27)
## [1.11.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.10.0...v1.11.0) (2025-11-27)
### ✨ Features | 新功能
* **invoice:** 添加发票金额和货币支持 ([244dd12](http://124.126.16.154:8888/singularity/hdk-pay/commit/244dd1220a2c19197ef08f41a82bcb273d0900e8))
## [1.10.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.7...v1.10.0) (2025-11-25)
### 🚀 Chore | 构建/工程依赖/工具
* **deps:** 移除 Carbon 依赖包 ([028721f](http://124.126.16.154:8888/singularity/hdk-pay/commit/028721feb1079eaa4fe80f20066912d46634f3df))
### ✅ Tests | 测试
* **product:** 移除测试中的 only 标记 ([1cb20a7](http://124.126.16.154:8888/singularity/hdk-pay/commit/1cb20a7c7e2c1a26c7b72669e6885d39f8d16005))
### ✨ Features | 新功能
* **invoice:** 引入点数价格值对象并更新发票产品结构 ([4c5dde9](http://124.126.16.154:8888/singularity/hdk-pay/commit/4c5dde9020364573d0e9673138620d967149e9f0))
### [1.9.7](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.6...v1.9.7) (2025-10-30)
### ✨ Features | 新功能
* **account:** 添加4D X无限奖励积分类型 ([7763b08](http://124.126.16.154:8888/singularity/hdk-pay/commit/7763b088dff711f2d95e65ec8437000322931f50))
### [1.9.6](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.5...v1.9.6) (2025-09-19)
### ♻️ Code Refactoring | 代码重构
* **Domain:** 重构 ExchangeRepoInterface 接口 ([31559fd](http://124.126.16.154:8888/singularity/hdk-pay/commit/31559fdf5ddec048680f520563fa7de56eae3e90))
### [1.9.5](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.4...v1.9.5) (2025-09-19)
### ♻️ Code Refactoring | 代码重构
* **domain:** 更新汇率接口并添加 UID 参数 ([e7e1c7f](http://124.126.16.154:8888/singularity/hdk-pay/commit/e7e1c7f6c946fa171cdbf8049f1d90864a043685))
* **ProductRepo:** 优化 getRate 方法参数处理 ([c552dd8](http://124.126.16.154:8888/singularity/hdk-pay/commit/c552dd8ed0b00f58fefa47c02219ce4de972e85c))
### [1.9.4](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.3...v1.9.4) (2025-09-19)
### 🐛 Bug Fixes | Bug 修复
* **product:** 修复产品列表中点数显示问题 ([eb44b6e](http://124.126.16.154:8888/singularity/hdk-pay/commit/eb44b6e3b6e9a2e3f757076d0d4438163e7d1f51))
### [1.9.3](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.2...v1.9.3) (2025-09-19)
### ✨ Features | 新功能
* **PointType:** 添加 ScanToModel 作为点类型 ([8bbc8ed](http://124.126.16.154:8888/singularity/hdk-pay/commit/8bbc8ed629e5c15e42db0adf758505e531ff3dca))
### [1.9.2](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.1...v1.9.2) (2025-09-19)
### ✨ Features | 新功能
* **Account:** 添加新的积分类型 ([874a6f4](http://124.126.16.154:8888/singularity/hdk-pay/commit/874a6f4fa96b09a4c6c652b6d285d4b6631a3c66))
### [1.9.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.9.0...v1.9.1) (2025-09-17)
### 🐛 Bug Fixes | Bug 修复
* **account:** 修复初始账户命令和测试 ([8f8f7b0](http://124.126.16.154:8888/singularity/hdk-pay/commit/8f8f7b08b03d9b810bb09ce4b1f15a27cbd43e68))
## [1.9.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.8.2...v1.9.0) (2025-09-17)
### ✨ Features | 新功能
* **account:** 添加初始化账户余额功能 ([87b09ef](http://124.126.16.154:8888/singularity/hdk-pay/commit/87b09ef34cd3427816ef2c357406a74975ada8a9))
### [1.8.2](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.8.1...v1.8.2) (2025-09-17)
### 🐛 Bug Fixes | Bug 修复
* **ProductRepo:** 修复产品仓库中的数组为空的处理逻辑 ([686d835](http://124.126.16.154:8888/singularity/hdk-pay/commit/686d835a9130d60768eef37a3c9a67c6526cb418))
### [1.8.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.8.0...v1.8.1) (2025-09-05)
### ✨ Features | 新功能
* **PointLog:** 添加获取病人姓名的方法并更新相关代码 ([3b12216](http://124.126.16.154:8888/singularity/hdk-pay/commit/3b1221634419f0ca39359e36c0363602b075b9b8))
## [1.8.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.7.0...v1.8.0) (2025-09-05)
### ✨ Features | 新功能
* **invoice:** 添加发票详情查询功能 ([93f9231](http://124.126.16.154:8888/singularity/hdk-pay/commit/93f923181c41ce7e96077f304efe6e980231f1f6))
## [1.7.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.6.1...v1.7.0) (2025-09-04)
### ✨ Features | 新功能
* **account:** 增加积分日志详情查询功能并支持发票信息 ([975a5ee](http://124.126.16.154:8888/singularity/hdk-pay/commit/975a5ee30110f27ceba0ef11fba751639189d57b))
### [1.6.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.6.0...v1.6.1) (2025-09-04)
### ✨ Features | 新功能
* **invoice:** 添加发票下载和发送功能 ([15c0ecb](http://124.126.16.154:8888/singularity/hdk-pay/commit/15c0ecb6fe8f227b09c4d4618ffb2f5560e4b261))
## [1.6.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.5.3...v1.6.0) (2025-09-04)
### ✨ Features | 新功能
* **invoice:** 添加发票下载功能并优化测试 ([366f1d6](http://124.126.16.154:8888/singularity/hdk-pay/commit/366f1d64add68d1bb8a9b3e5f17b23963a91d3bc))
* **invoice:** 添加发票发送功能并进行测试 ([72f7d37](http://124.126.16.154:8888/singularity/hdk-pay/commit/72f7d37382752047ed4c15809f16c3f1d07e16e0))
### [1.5.3](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.5.2...v1.5.3) (2025-09-04)
### ♻️ Code Refactoring | 代码重构
* **invoice:** 重构发票创建流程和积分日志接口 ([8a70e35](http://124.126.16.154:8888/singularity/hdk-pay/commit/8a70e35de72d269bbbd0b5e05c3fa4bccdf1878c))
* **PointLogRepo:** 优化 getList 方法参数类型 ([86f375b](http://124.126.16.154:8888/singularity/hdk-pay/commit/86f375b18a0c3213e405b6fcaec20224979dd991))
### [1.5.2](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.5.1...v1.5.2) (2025-09-02)
### 🐛 Bug Fixes | Bug 修复
* **AccountBalanceRepo:** 修复积分余额过期时间解析 ([c2358ae](http://124.126.16.154:8888/singularity/hdk-pay/commit/c2358ae19b072dc0f84a76949ce748f9ce15da4f))
### [1.5.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.5.0...v1.5.1) (2025-09-01)

View File

@@ -36,8 +36,7 @@
"firebase/php-jwt": "^6.8.0",
"hyperf/testing": "^3.1",
"friendsofhyperf/pest-plugin-hyperf": "3.1.*",
"swoole/ide-helper": "^4.8.13",
"nesbot/carbon": "^2.0"
"swoole/ide-helper": "^4.8.13"
},
"minimum-stability": "beta",
"prefer-stable": true,
@@ -46,7 +45,8 @@
"sort-packages": true,
"allow-plugins": {
"pestphp/pest-plugin": true
}
},
"secure-http": false
},
"scripts": {
"post-root-package-install": [
@@ -58,17 +58,17 @@
"APP_STATUS=false pest --coroutine --prepend=tests/bootstrap.php --colors=always $1"
],
"cs-fix": "php-cs-fixer fix $1",
"analyse": "phpstan analyse --memory-limit 300M -l 0 -c phpstan.neon ./app ./config"
"analyse": "phpstan analyse --memory-limit 300M -l 0 -c phpstan.neon ./src ./config"
},
"repositories": {
"nest": {
"satis": {
"type": "composer",
"url": "https://nest.doylee.cn/api/packages/HDK/composer"
"url": "https://satis.luxcreo.cn/"
},
"packagist": {
"type": "composer",
"url": "https://mirrors.aliyun.com/composer/"
}
},
"version": "1.5.1"
}
"version": "1.13.2"
}

1223
composer.lock generated

File diff suppressed because it is too large Load Diff

214
llm.txt Normal file
View File

@@ -0,0 +1,214 @@
# HDK-Pay 项目分析报告
## 1. 项目基本信息
- **项目名称**: HDK-Pay
- **项目类型**: PHP 支付平台 SDK
- **描述**: 用于连接 LuxPay 支付平台的 SDK
- **版本**: 1.11.1
- **PHP 版本要求**: >= 8.2
- **许可证**: MIT
## 2. 技术栈
### 2.1 核心依赖
- **PHP**: >= 8.2
- **Hyperf**: ~3.1.0 (框架)
- **Guzzle**: 用于 HTTP 请求
- **MoneyPHP**: 货币处理
- **Carbon**: 日期时间处理
- **BCMath 扩展**: 高精度数学计算
### 2.2 开发依赖
- **PHPUnit**: 单元测试
- **Pest**: 测试框架
- **PHPStan**: 静态代码分析
- **PHP-CS-Fixer**: 代码风格检查
## 3. 项目架构
### 3.1 目录结构
```
├── src/ # 源代码目录
│ ├── Application/ # 应用层
│ │ ├── Command/ # 命令行工具
│ │ └── Dto/ # 数据传输对象
│ ├── Domain/ # 领域层
│ │ ├── Account/ # 账户领域
│ │ ├── Invoice/ # 发票领域
│ │ ├── Product/ # 产品领域
│ │ └── Transaction/ # 交易领域
│ ├── Enum/ # 枚举类
│ ├── Infrastructure/ # 基础设施层
│ │ └── Repository/ # 仓库实现
│ ├── Resource/ # 资源层
│ ├── Sdk/ # SDK 接口
│ ├── Trait/ # 特质
│ └── ConfigProvider.php # 配置提供者
├── tests/ # 测试目录
├── publish/ # 发布配置
├── scripts/ # 脚本工具
├── composer.json # Composer 配置
└── README.md # 项目说明
```
### 3.2 架构模式
- **领域驱动设计 (DDD)**: 项目采用 DDD 架构,清晰划分了领域层、应用层和基础设施层
- **依赖倒置原则**: 通过接口定义依赖,实现了高层模块与低层模块的解耦
- **聚合根模式**: 核心领域对象如 TransactionRecord、Invoice 等都继承自 AggregateRoot
## 4. 核心功能模块
### 4.1 账户管理
- **账户余额**: 管理用户账户余额和积分
- **积分日志**: 记录积分的增减变动
- **积分类型**: 支持多种积分类型管理
### 4.2 交易管理
- **订单处理**: 支持创建、查询、更新订单
- **支付类型**: 支持卡片支付和积分支付
- **订单状态**: 完整的订单生命周期管理
- **交易记录**: 详细的交易记录和退款记录
### 4.3 发票管理
- **发票创建**: 支持创建发票
- **地址管理**: 支持常用地址管理
- **发票产品**: 管理发票中的产品信息
### 4.4 产品管理
- **充值产品**: 管理充值产品
- **产品类型**: 支持多种产品类型
- **充值效果**: 定义充值产品的效果
## 5. 主要领域模型
### 5.1 账户领域
- **AccountBalance**: 账户余额聚合根
- **PointsBalance**: 积分余额值对象
- **PointLog**: 积分日志聚合根
### 5.2 交易领域
- **TransactionRecord**: 交易记录聚合根
- **Item**: 交易项值对象
- **CardTransaction**: 卡片交易值对象
- **PointTransaction**: 积分交易值对象
### 5.3 发票领域
- **Invoice**: 发票聚合根
- **Address**: 地址值对象
- **InvoiceInfo**: 发票信息值对象
- **InvoiceProduct**: 发票产品值对象
### 5.4 产品领域
- **RechargeProduct**: 充值产品聚合根
- **ProductItem**: 产品项实体
- **RechargeEffect**: 充值效果值对象
## 6. RPC 服务
### 6.1 核心 RPC 类
- **OrderRpc**: 订单相关 RPC 服务
- **GoodsRpc**: 商品相关 RPC 服务
- **StripeRpc**: Stripe 支付相关 RPC 服务
- **WechatRpc**: 微信支付相关 RPC 服务
### 6.2 主要接口
- **create**: 创建订单
- **webhooksNotificationHandler**: 处理 Webhooks 通知
## 7. 配置说明
### 7.1 配置文件
- **payment.php**: 支付平台配置文件,包含基础 URI 等配置
### 7.2 配置项
- **http_request.pay.rpc_base_uri**: RPC 基础 URI通常为 https://pay.luxcreo.cn 或 https://test-pay.luxcreo.cn
- **payment.base_uri**: 支付平台基础 URI
## 8. 测试策略
### 8.1 测试类型
- **单元测试**: 测试单个类或方法
- **功能测试**: 测试完整的业务流程
- **集成测试**: 测试不同模块之间的交互
### 8.2 测试框架
- **PHPUnit**: 用于单元测试和功能测试
- **Pest**: 用于更简洁的测试编写
### 8.3 测试执行
```bash
vendor/bin/phpunit # 运行所有测试
composer test # 运行测试脚本
```
## 9. 开发流程
### 9.1 运行环境说明
项目通过本地运行 Docker 来创建运行容器,因此所有执行的终端命令都应该使用以下方式之一:
- 使用 `run-in-docker.sh` 脚本:`./run-in-docker.sh <command>`
- 使用 `scripts/test/` 下的脚本:`./scripts/test/<script-name>.sh`
### 9.2 安装依赖
```bash
./run-in-docker.sh composer install
```
### 9.3 代码风格检查
```bash
./run-in-docker.sh composer cs-fix
# 或使用专门的脚本
./scripts/test/code-style-check.sh
```
### 9.4 代码风格修复
```bash
./scripts/test/code-style-fix.sh
```
### 9.5 静态代码分析
```bash
./run-in-docker.sh composer analyse
# 或使用专门的脚本
./scripts/test/static-analysis.sh
```
### 9.6 运行测试
```bash
./run-in-docker.sh composer test
# 或使用专门的脚本
./scripts/test/all-tests.sh # 运行所有测试
./scripts/test/unit-tests.sh # 运行单元测试
```
### 9.7 CI 流程
```bash
./scripts/test/ci.sh
```
## 10. 发布与部署
### 10.1 发布配置
```bash
php bin/hyperf.php vendor:publish singularity/hdk-pay
```
### 10.2 部署方式
- 支持 Docker 部署
- 支持传统 PHP-FPM 部署
- 支持 Hyperf 协程部署
## 11. 总结
HDK-Pay 是一个基于 Hyperf 框架开发的支付平台 SDK采用领域驱动设计架构支持多种支付方式和交易类型。项目具有清晰的代码结构、完整的测试覆盖和良好的扩展性适合作为企业级支付解决方案的基础组件。
主要特点:
- 基于 DDD 架构,领域模型清晰
- 支持多种支付方式和交易类型
- 完整的订单生命周期管理
- 强大的发票管理功能
- 灵活的配置和扩展机制
- 完善的测试覆盖
- 支持多环境部署
该项目为企业提供了一个可靠、安全、易于扩展的支付解决方案,能够满足不同业务场景的支付需求。

5399
openapi.json Normal file

File diff suppressed because one or more lines are too long

26
run-in-docker.sh Executable file
View File

@@ -0,0 +1,26 @@
#!/usr/bin/env sh
# 使用与 docker-env.sh 一致的项目名
project=hdk-pay
# 检查容器是否在运行
if ! docker ps | grep -q "$project"; then
echo "容器 $project 未运行,正在启动..."
# 直接在后台启动容器,使用随机端口,并保持运行
docker run \
--pull always \
-d --name "$project" \
--privileged -u root \
-w "/srv/www" \
-v "$(pwd)":/srv/www \
-v ~/.ssh:/root/.ssh \
-p 9501 \
harbor.luxcreo.cn/library/hyperf:8.2-swoole tail -f /dev/null
# 显示分配的端口信息
echo "容器已启动,分配的端口:"
docker port "$project" 9501
fi
# 执行命令
docker exec -it "$project" sh -c "cd /srv/www && $*"

6
scripts/test/all-tests.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# 运行所有 Pest 测试脚本
# 运行所有 Pest 测试(包括数据库测试)
./run-in-docker.sh vendor/bin/pest --coroutine --prepend=tests/bootstrap.php --colors=always

6
scripts/test/ci.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# 完整的 CI 流程脚本
# 运行完整的 CI 流程
./run-in-docker.sh composer ci

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# 代码风格检查脚本
# 检查代码风格,只使用配置文件中定义的规则
./run-in-docker.sh vendor/bin/php-cs-fixer check src/ --allow-risky=yes --config=.php-cs-fixer.dist.php

6
scripts/test/code-style-fix.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# 代码风格修复脚本
# 修复代码风格,只使用配置文件中定义的规则
./run-in-docker.sh vendor/bin/php-cs-fixer fix src/ tests/ --allow-risky=yes --config=.php-cs-fixer.dist.php

6
scripts/test/phpspec-tests.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# Phpspec BDD 测试脚本
# 运行所有 Phpspec 测试
./run-in-docker.sh vendor/bin/phpspec run

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# 代码静态分析脚本
# 运行完整的代码静态分析
./run-in-docker.sh vendor/bin/phpstan analyse src/ tests/

6
scripts/test/unit-tests.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env sh
# 非数据库依赖的单元测试脚本
# 运行非数据库依赖的单元测试
./run-in-docker.sh vendor/bin/pest tests/Unit/ --exclude-group database --coroutine --prepend=tests/bootstrap.php --colors=always

View File

@@ -11,17 +11,21 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Application\Command;
final readonly class CreateInvoiceCmd {
use Money\Money;
final readonly class CreateInvoiceCmd
{
public function __construct(
public string $uid,
public string $caseId,
public bool $setFreqInvAddr,
public string $receiver,
public string $patientName,
public string $address,
public string $city,
public string $state,
public string $country,
public string $zipCode,
public string $caseId,
public bool $setFreqInvAddr,
public string $receiver,
public string $patientName,
public string $address,
public string $city,
public string $state,
public string $country,
public string $zipCode,
public Money $price,
public string $currencySymbol,
) {}
}

View File

@@ -0,0 +1,40 @@
<?php
/**
* InitialAccountCmd.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/9/17
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Application\Command;
use Carbon\Carbon;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
final class InitialAccountCmd
{
public array $pointsBalances;
public function __construct(
public readonly string $uid,
) {}
public function addPointsBalance(
PointType $type,
float $basic = 0.0,
float $bonus = 0.0,
?Carbon $expiredAt = null,
?string $version = null,
): array {
return $this->pointsBalances[] = [
'type' => $type->value,
'basic' => $basic,
'bonus' => $bonus,
'expired_at' => $expiredAt->toDateTimeString(),
'version' => $version,
];
}
}

View File

@@ -54,17 +54,19 @@ final class RechargeProductsDto extends AbstractDto
if (!$is_ftai) {
$result += [
'total_points' => $effect->getPointTotal(),
'bonus_rate_pct' => (float)(bcmul(
num1: $effect->getPointTotal() == 0
? '0'
: bcdiv(
(string)$effect->pointBonus,
(string)$effect->getPointTotal(),
3,
),
num2: '100',
scale: 0,
)),
'bonus_rate_pct' => round(
(float)(bcmul(
num1: $effect->getPointTotal() == 0
? '0'
: bcdiv(
(string)$effect->pointBonus,
(string)$effect->getPointTotal(),
3,
),
num2: '100',
scale: 3,
)),
),
'point' => [
'total' => $effect->getPointTotal(),
'number' => $effect->pointBasic,

View File

@@ -14,7 +14,7 @@ use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceRepoInterface;
use Singularity\HDK\Pay\Domain\Product\Repository\ExchangeRepoInterface;
use Singularity\HDK\Pay\Domain\Product\Repository\RechargeProductRepoInterface;
use Singularity\HDK\Pay\Domain\Transaction\Repository\OrderRepoInterface;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountBalanceRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\FrequentAddressRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceProductRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceRepo;
@@ -40,7 +40,7 @@ class ConfigProvider
// Repo
// account
AccountRepoInterface::class => AccountBalanceRepo::class,
AccountRepoInterface::class => AccountRepo::class,
PointLogRepoInterface::class => PointLogRepo::class,
// product
@@ -78,4 +78,4 @@ class ConfigProvider
],
];
}
}
}

View File

@@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog;
use Carbon\Carbon;
use Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\ValueObject\InvoiceRecord;
use Singularity\HDK\Pay\Domain\AggregateRoot;
final class PointLog extends AggregateRoot
@@ -24,9 +25,17 @@ final class PointLog extends AggregateRoot
private readonly string $source,
private readonly string $operator,
private readonly string $description,
private readonly string $patientName,
private readonly Carbon $date,
private readonly bool $invoiceable,
private readonly ?InvoiceRecord $invoiceRecord,
) {}
public function getPatientName(): string
{
return $this->patientName;
}
public function getDescription(): string
{
return $this->description;
@@ -67,4 +76,19 @@ final class PointLog extends AggregateRoot
{
return $this->id;
}
public function getInvoiceNo(): ?string
{
return $this->invoiceRecord?->invoiceNo;
}
public function getInvoiceReceiver(): ?string
{
return $this->invoiceRecord?->receiver;
}
public function getInvoiceable(): bool
{
return $this->invoiceable;
}
}

View File

@@ -0,0 +1,20 @@
<?php
/**
* InvoiceRecord.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/9/4
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\ValueObject;
final class InvoiceRecord
{
public function __construct(
public string $invoiceNo,
public string $receiver,
) {}
}

View File

@@ -21,6 +21,10 @@ enum PointType: string
case Aligner4D = 'aligner-4d';
case NightguardAi = 'nightguard-ai';
case ScanToModel = 'scan-to-model';
case FourDXUnlimitedBonusCredits = 'aligner-4d-u';
public static function values(): array
{
return [
@@ -30,6 +34,8 @@ enum PointType: string
self::FtaiRetainer->value,
self::Aligner4D->value,
self::NightguardAi->value,
self::ScanToModel->value,
self::FourDXUnlimitedBonusCredits->value,
];
}
}

View File

@@ -7,17 +7,52 @@
* Powered by PhpStorm
* Created on 2025/8/17
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Repository;
use Singularity\HDK\Pay\Application\Command\InitialAccountCmd;
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\AccountBalance;
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\PointsBalance;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Domain\Account\ValueObject\Email;
interface AccountRepoInterface
{
/**
* @param string $uid
* @return AccountBalance
*/
public function getAccount(string $uid): AccountBalance;
/**
* @param string $uid
* @param PointType $pointType
* @return PointsBalance
*/
public function getPointBalance(string $uid, PointType $pointType): PointsBalance;
}
/**
* @param InitialAccountCmd $cmd
* @return void
*/
public function initial(InitialAccountCmd $cmd): void;
/**
* 获取用户常用邮箱
*
* @param string $uid
* @return Email
*/
public function getEmail(string $uid): Email;
/**
* 更新用户常用邮箱
*
* @param string $uid
* @param Email $email
* @return void
*/
public function updateEmail(string $uid, Email $email): void;
}

View File

@@ -19,4 +19,9 @@ interface PointLogRepoInterface
*/
public function getList(string $uid): array;
/**
* @param string $caseId
* @return PointLog
*/
public function getDetail(string $caseId): PointLog;
}

View File

@@ -0,0 +1,38 @@
<?php
/**
* Email.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/11/28
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\ValueObject;
use Singularity\HDK\Pay\Domain\ValueObject;
final class Email extends ValueObject
{
private string $email;
public function __construct(string $email)
{
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
throw new \InvalidArgumentException('Invalid email address: ' . $email);
}
$this->email = $email;
}
public function getValue(): string
{
return $this->email;
}
public function __toString(): string
{
return $this->email;
}
}

View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
use Money\Money;
use Singularity\HDK\Pay\Domain\AggregateRoot;
final class Invoice extends AggregateRoot
@@ -22,8 +23,25 @@ final class Invoice extends AggregateRoot
private readonly Address $address,
private readonly bool $setFreqInvAddr,
private readonly string $receiver,
private readonly Money $price,
private readonly string $currencySymbol,
) {}
public function getAmount(): float
{
return (float)bcdiv($this->price->getAmount(), '100', 2);
}
public function getCurrencyCode(): string
{
return $this->price->getCurrency()->getCode();
}
public function getCurrencySymbol(): string
{
return $this->currencySymbol;
}
public function getInvoiceNo(): string
{
return $this->invoiceNo;

View File

@@ -0,0 +1,100 @@
<?php
/**
* InvoiceInfo.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/9/5
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
use Carbon\Carbon;
use Money\Money;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointBalance;
final readonly class InvoiceInfo
{
public function __construct(
private string $invoiceNo,
private string $uid,
private string $caseId,
private Address $address,
private InvoiceProduct $product,
private PointBalance $balance,
private string $receiver,
private Carbon $invoiceAt,
private Carbon $designedAt,
private string $patientName,
private Money $price,
private string $currencySymbol,
) {}
public function getAmount(): float
{
return (float)bcdiv($this->price->getAmount(), '100', 2);
}
public function getCurrencyCode(): string
{
return $this->price->getCurrency()->getCode();
}
public function getCurrencySymbol(): string
{
return $this->currencySymbol;
}
public function getInvoiceNo(): string
{
return $this->invoiceNo;
}
public function getUid(): string
{
return $this->uid;
}
public function getCaseId(): string
{
return $this->caseId;
}
public function getAddress(): Address
{
return $this->address;
}
public function getProduct(): InvoiceProduct
{
return $this->product;
}
public function getBalance(): PointBalance
{
return $this->balance;
}
public function getReceiver(): string
{
return $this->receiver;
}
public function getInvoiceAt(): Carbon
{
return $this->invoiceAt;
}
public function getDesignedAt(): Carbon
{
return $this->designedAt;
}
public function getPatientName(): string
{
return $this->patientName;
}
}

View File

@@ -11,12 +11,23 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointPrice;
final readonly class InvoiceProduct {
/**
* @param string $caseId
* @param string $uid
* @param string $name
* @param string $sku
* @param string $description
* @param PointPrice[] $prices
*/
public function __construct(
public string $caseId,
public string $uid,
public string $name,
public string $sku,
public string $description,
public array $prices,
) {}
}

View File

@@ -0,0 +1,20 @@
<?php
/**
* PointBalance.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/9/5
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject;
final readonly class PointBalance {
public function __construct(
public float $total,
public float $cost,
public float $remain,
) {}
}

View File

@@ -0,0 +1,23 @@
<?php
/**
* PointPrice.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/11/25
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject;
use Money\Money;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
final readonly class PointPrice
{
public function __construct(
public Money $price,
public string $currencySymbol,
) {}
}

View File

@@ -1,4 +1,5 @@
<?php
/**
* InvoiceRepoInterface.php@Pay
*
@@ -9,14 +10,39 @@
namespace Singularity\HDK\Pay\Domain\Invoice\Repository;
use GuzzleHttp\Exception\GuzzleException;
use Psr\Http\Message\ResponseInterface;
use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceInfo;
interface InvoiceRepoInterface
{
/**
* @param CreateInvoiceCmd $cmd
* @return Invoice
* @throws GuzzleException
*/
public function create(CreateInvoiceCmd $cmd): Invoice;
}
/**
* @param string $invoiceNo
* @return ResponseInterface
* @throws GuzzleException
*/
public function download(string $invoiceNo): ResponseInterface;
/**
* @param string $invoiceNo
* @param string|null $email
* @return void
* @throws GuzzleException
*/
public function send(string $invoiceNo, ?string $email): void;
/**
* @param string $invoiceNo
* @return InvoiceInfo
*/
public function findOne(string $invoiceNo): InvoiceInfo;
}

View File

@@ -16,7 +16,8 @@ interface ExchangeRepoInterface
/**
* @param PointType $source
* @param PointType $target
* @param string|null $uid
* @return float
*/
public function getRate(PointType $source, PointType $target): float;
public function getRate(PointType $source, PointType $target, ?string $uid = null): float;
}

View File

@@ -7,10 +7,11 @@
* Powered by PhpStorm
* Created on 2025/8/12
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain;
use Swoole\ArrayObject;
abstract class ValueObject extends ArrayObject {}
abstract class ValueObject extends ArrayObject {}

View File

@@ -1,23 +1,27 @@
<?php
/**
* AccountBalanceRpc.php@Pay
* AccountRepo.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/17
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Carbon\Carbon;
use Hyperf\Codec\Json;
use Singularity\HDK\Pay\Application\Command\InitialAccountCmd;
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\AccountBalance;
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\PointsBalance;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Domain\Account\Repository\AccountRepoInterface;
use Singularity\HDK\Pay\Domain\Account\ValueObject\Email;
final class AccountBalanceRepo extends AbstractRepo implements AccountRepoInterface
final class AccountRepo extends AbstractRepo implements AccountRepoInterface
{
public function getAccount(string $uid): AccountBalance
{
@@ -35,13 +39,13 @@ final class AccountBalanceRepo extends AbstractRepo implements AccountRepoInterf
uid: $result['uid'],
pointsBalances: array_map(
callback: fn($pointBalance)
=> new PointsBalance(
=> new PointsBalance(
type: PointType::from($pointBalance['name']),
total: $pointBalance['total'],
cost: $pointBalance['cost'],
amount: $pointBalance['amount'],
version: $pointBalance['version'],
expiredAt: $pointBalance['expired_at'],
expiredAt: isset($pointBalance['expired_at']) ? new Carbon($pointBalance['expired_at']) : null,
),
array: $result['point_balance'],
),
@@ -63,7 +67,42 @@ final class AccountBalanceRepo extends AbstractRepo implements AccountRepoInterf
cost: $result['cost'],
amount: $result['amount'],
version: $result['version'],
expiredAt: $result['expired_at'],
expiredAt: isset($result['expired_at']) ? new Carbon($result['expired_at']) : null,
);
}
}
/**
* @inheritDoc
*/
public function initial(InitialAccountCmd $cmd): void
{
$uid = $cmd->uid;
$this->requestService->requestPost(
url: "/rpc/v2/account/$uid/balance",
data: $cmd->pointsBalances
);
}
public function getEmail(string $uid): Email
{
$response = $this->requestService->requestGet(
url: "/rpc/v2/account/$uid/inv-email"
);
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new Email($result['email']);
}
public function updateEmail(string $uid, Email $email): void
{
$this->requestService->requestPut(
url: "/rpc/v2/account/$uid/inv-email",
data: [
'email' => $email->getValue()
]
);
}
}

View File

@@ -12,7 +12,10 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Hyperf\Codec\Json;
use Money\Currency;
use Money\Money;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointPrice;
use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceProductRepoInterface;
final class InvoiceProductRepo extends AbstractRepo implements InvoiceProductRepoInterface
@@ -33,6 +36,16 @@ final class InvoiceProductRepo extends AbstractRepo implements InvoiceProductRep
name: $result['name'],
sku: $result['sku'],
description: $result['description'],
prices: array_map(
callback: fn(array $price) => new PointPrice(
price: new Money(
amount: bcmul((string)$price['amount'], '100', 2),
currency: new Currency($price['currency']),
),
currencySymbol: $price['symbol'],
),
array: $result['prices'],
),
);
}
}

View File

@@ -7,22 +7,36 @@
* Powered by PhpStorm
* Created on 2025/8/29
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Carbon\Carbon;
use Hyperf\Codec\Json;
use Money\Currency;
use Money\Money;
use Psr\Http\Message\ResponseInterface;
use Singularity\HDK\Core\Exceptions\ValidateException;
use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Address;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceInfo;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointBalance;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointPrice;
use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceRepoInterface;
final class InvoiceRepo extends AbstractRepo implements InvoiceRepoInterface
{
/**
* @inheritDoc
*/
public function create(CreateInvoiceCmd $cmd): Invoice
{
$money = $cmd->price;
$response = $this->requestService->requestPost(
url: "/rpc/v2/account/$cmd->uid/logs/points/$cmd->caseId/invoices",
url: "/rpc/v2/account/logs/points/$cmd->caseId/invoices",
data: [
'set_freq_addr' => $cmd->setFreqInvAddr,
'receiver' => $cmd->receiver,
@@ -32,12 +46,20 @@ final class InvoiceRepo extends AbstractRepo implements InvoiceRepoInterface
'state' => $cmd->state,
'country' => $cmd->country,
'zip' => $cmd->zipCode,
'price' => [
'amount' => (float)bcdiv($money->getAmount(), '100', 2),
'currency' => [
'code' => $money->getCurrency()->getCode(),
'symbol' => $cmd->currencySymbol,
],
],
],
);
$content = $response->getBody()->getContents();
$result = Json::decode($content);
$price = $result['price'];
return new Invoice(
invoiceNo: $result['invoice_no'],
uid: $result['uid'],
@@ -52,6 +74,89 @@ final class InvoiceRepo extends AbstractRepo implements InvoiceRepoInterface
),
setFreqInvAddr: $result['set_freq_addr'],
receiver: $result['receiver'],
price: new Money(
bcmul((string)$price['amount'], '100', 2),
new Currency($price['code']),
),
currencySymbol: $price['symbol'],
);
}
}
/**
* @inheritDoc
*/
public function send(string $invoiceNo, ?string $email): void
{
if (empty($invoiceNo)) {
throw new ValidateException(message: 'invoice no is required.');
}
$this->requestService->requestGet(
url: "/rpc/v2/invoice/invoices/$invoiceNo/email",
data: [
'email' => $email,
],
);
}
/**
* @inheritDoc
*/
public function download(string $invoiceNo): ResponseInterface
{
if (empty($invoiceNo)) {
throw new ValidateException(message: 'invoice no is required.');
}
return $this->requestService->requestGet(url: "/rpc/v2/invoice/invoices/$invoiceNo/pdf");
}
/**
* @inheritDoc
*/
public function findOne(string $invoiceNo): InvoiceInfo
{
if (empty($invoiceNo)) {
throw new ValidateException(message: 'invoice no is required.');
}
$response = $this->requestService->requestGet(url: "/rpc/v2/invoice/invoices/$invoiceNo");
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new InvoiceInfo(
invoiceNo: $result['invoice_no'],
uid: $result['uid'],
caseId: $result['case_id'],
address: new Address(
patientName: $result['patient_name'],
address: $result['address']['address'],
city: $result['address']['city'],
state: $result['address']['state'],
country: $result['address']['country'],
zipCode: $result['address']['zip_code'],
),
product: new InvoiceProduct(
caseId: $result['case_id'],
uid: $result['uid'],
name: $result['product']['name'],
sku: $result['product']['sku'],
description: $result['product']['description'],
prices: [],
),
balance: new PointBalance(
total: $result['balance']['total'],
cost: $result['balance']['cost'],
remain: $result['balance']['remain'],
),
receiver: $result['receiver'],
invoiceAt: new Carbon($result['invoice_at']),
designedAt: new Carbon($result['designed_at']),
patientName: $result['patient_name'],
price: new Money(
bcmul((string)$result['price']['amount'], '100', 2),
new Currency($result['price']['currency_code']),
),
currencySymbol: $result['price']['currency_symbol'],
);
}
}

View File

@@ -12,15 +12,25 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Carbon\Carbon;
use GuzzleHttp\Exception\GuzzleException;
use Hyperf\Codec\Json;
use Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\PointLog;
use Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\ValueObject\InvoiceRecord;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Domain\Account\Repository\PointLogRepoInterface;
final class PointLogRepo extends AbstractRepo implements PointLogRepoInterface
{
public function getList(string $uid): array
/**
* @param string $uid
* @param PointType|null $type
* @return array{}|PointLog[]
* @throws GuzzleException
*/
public function getList(string $uid, ?PointType $type = null): array
{
$response = $this->requestService->requestGet(url: "/rpc/v2/account/$uid/logs/points");
$type = isset($type) ? $type->value : 'all';
$response = $this->requestService->requestGet(url: "/rpc/v2/account/$uid/balance/$type/logs");
$content = $response->getBody()->getContents();
$result = Json::decode($content);
@@ -34,8 +44,46 @@ final class PointLogRepo extends AbstractRepo implements PointLogRepoInterface
source: $item['source'],
operator: $item['operator'],
description: $item['description'],
patientName: $item['patient_name'],
date: new Carbon($item['date']),
invoiceable: $item['invoiceable'],
invoiceRecord: isset($item['invoice_record'])
? new InvoiceRecord(
invoiceNo: $item['invoice_record']['invoice_no'],
receiver: $item['invoice_record']['receiver'],
)
: null,
);
}, $result);
}
/**
* @inheritDoc
*/
public function getDetail(string $caseId): PointLog
{
$response = $this->requestService->requestGet(url: "/rpc/v2/account/logs/points/$caseId");
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new PointLog(
id: $result['id'],
caseId: $result['case_id'],
uid: $result['uid'],
credits: $result['credits'],
source: $result['source'],
operator: $result['operator'],
description: $result['description'],
patientName: $result['patient_name'],
date: new Carbon($result['date']),
invoiceable: $result['invoiceable'],
invoiceRecord: isset($result['invoice_record'])
? new InvoiceRecord(
$result['invoice_record']['invoice_no'],
$result['invoice_record']['receiver'],
)
: null,
);
}
}

View File

@@ -45,7 +45,7 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
id: $result['one_time']['id'],
description: $result['one_time']['name'],
unitPrice: new Money(
amount:bcmul((string)$result['one_time']['price'], '100'),
amount: bcmul((string)$result['one_time']['price'], '100'),
currency: new Currency($result['one_time']['currency']),
),
productType: ProductType::oneTime,
@@ -55,20 +55,23 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
pointBonus: $result['one_time']['point']['bonus'],
),
),
packages: array_map(fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
packages: array_map(
fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
),
productType: ProductType::pack,
effect: new RechargeEffect(
pointType: PointType::LuxPoint,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
),
productType: ProductType::pack,
effect: new RechargeEffect(
pointType: PointType::LuxPoint,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
), $result['package']),
$result['package'] ?? [],
),
);
}
@@ -99,29 +102,35 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
),
)
: null,
plans: array_map(fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
plans: array_map(
fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
),
productType: ProductType::plan,
),
productType: ProductType::plan,
), $result['plan']),
packages: array_map(fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
$result['plan'] ?? [],
),
packages: array_map(
fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
),
productType: ProductType::plan,
effect: new RechargeEffect(
pointType: $pointType,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
),
productType: ProductType::plan,
effect: new RechargeEffect(
pointType: $pointType,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
), $result['package']),
$result['package'] ?? [],
),
);
}
@@ -139,12 +148,12 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
$result = Json::decode($content);
return new RechargeProduct(
oneTime: isset($result['one_time'])
oneTime: !empty($result['one_time'])
? new ProductItem(
id: $result['one_time']['id'],
description: $result['one_time']['name'],
unitPrice: new Money(
amount:bcmul((string)$result['one_time']['price'], '100'),
amount: bcmul((string)$result['one_time']['price'], '100'),
currency: new Currency($result['one_time']['currency']),
),
productType: ProductType::oneTime,
@@ -155,7 +164,7 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
),
)
: null,
renew: isset($result['renew'])
renew: !empty($result['renew'])
? new ProductItem(
id: $result['renew']['id'],
description: $result['renew']['name'],
@@ -171,20 +180,23 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
),
)
: null,
plans: array_map(fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
plans: array_map(
fn(array $item) => new ProductItem(
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
),
productType: ProductType::plan,
effect: new RechargeEffect(
pointType: PointType::EMA,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
),
productType: ProductType::plan,
effect: new RechargeEffect(
pointType: PointType::EMA,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
), $result['plan']),
$result['plan'] ?? [],
),
);
}
@@ -194,10 +206,11 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
* @return float
* @throws GuzzleException
*/
public function getRate(PointType $source, PointType $target): float
public function getRate(PointType $source, PointType $target, ?string $uid = null): float
{
$response = $this->requestService->requestGet(
url: "/rpc/v2/products/$target->value/exchange-rate/$source->value",
params: array_filter(['uid' => $uid]),
);
$content = $response->getBody()->getContents();

View File

@@ -0,0 +1,53 @@
<?php
/**
* InitialAccountBalanceTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/9/17
*/
use Carbon\Carbon;
use Singularity\HDK\Pay\Application\Command\InitialAccountCmd;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountRepo;
use function Hyperf\Support\make;
it('should initial account balance', function () {
$uid = uniqid('TDD');
$data = [
[
'type' => 'aligner',
'basic' => 0,
'bonus' => 40,
'expired_at' => Carbon::now()->addYear(),
'version' => 'trial',
],
[
'type' => 'ema',
'basic' => 0,
'bonus' => 1,
'expired_at' => Carbon::now()->addYear(),
'version' => 'Trial',
],
];
$cmd = new InitialAccountCmd($uid);
foreach ($data as $point_balance) {
$cmd->addPointsBalance(
type: PointType::from($point_balance['type']),
basic: $point_balance['basic'],
bonus: $point_balance['bonus'],
expiredAt:$point_balance['expired_at'],
version: $point_balance['version'],
);
}
$repo = make(AccountRepo::class);
$repo->initial($cmd);
expect(true)->toBeTrue();
});

View File

@@ -9,13 +9,13 @@
*/
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\AccountBalance;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountBalanceRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountRepo;
use function Hyperf\Support\make;
it('should be able to query account information', function () {
$uid = '123456';
$repo = make(AccountBalanceRepo::class);
$repo = make(AccountRepo::class);
$result = $repo->getAccount($uid);
expect($result)
->toBeInstanceOf(AccountBalance::class)

View File

@@ -0,0 +1,35 @@
<?php
/**
* QueryEmailTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/11/28
*/
use Singularity\HDK\Pay\Domain\Account\ValueObject\Email;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountRepo;
use function Hyperf\Support\make;
it('should be able to get user email', function () {
$uid = '123456';
$repo = make(AccountRepo::class);
$result = $repo->getEmail($uid);
expect($result)
->toBeInstanceOf(Email::class);
});
it('should be able to update user email', function () {
$uid = '123456';
$newEmail = 'test@example.com';
$repo = make(AccountRepo::class);
$email = new Email($newEmail);
$repo->updateEmail($uid, $email);
// 验证更新后的邮箱
$result = $repo->getEmail($uid);
expect($result->getValue())->toBe($newEmail);
});

View File

@@ -10,13 +10,13 @@
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\PointsBalance;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountBalanceRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountRepo;
use function Hyperf\Support\make;
it('should query point balance', function () {
$uid = 'cn3221';
$repo = make(AccountBalanceRepo::class);
$repo = make(AccountRepo::class);
$point_balance = $repo->getPointBalance($uid, PointType::EMA);
expect($point_balance)
->toBeInstanceOf(PointsBalance::class)

View File

@@ -1,7 +1,7 @@
<?php
/**
* QueryPointLogListTest.php@Pay
* QueryPointLogTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
@@ -23,3 +23,12 @@ it('should can query point log list', function () {
->each
->toBeInstanceOf(PointLog::class);
});
it('should can query a point log', function () {
$case_id = '68b6ac37a6440';
$repo = make(PointLogRepo::class);
$log = $repo->getDetail($case_id);
expect($log)
->toBeInstanceOf(PointLog::class);
});

View File

@@ -8,6 +8,8 @@
* Created on 2025/8/29
*/
use Money\Money;
use Psr\Http\Message\ResponseInterface;
use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceRepo;
@@ -19,7 +21,6 @@ it('should can create invoice', function () {
$invoice = $repo->create(
new CreateInvoiceCmd(
uid: '61dbe752d4caa',
caseId: '68affb136c01d',
setFreqInvAddr: true,
receiver: "dongyun.li@luxcreo.ai",
@@ -29,9 +30,32 @@ it('should can create invoice', function () {
state: "Illinois",
country: "United States",
zipCode: "67890-1234",
price: Money::EUR('19900'),
currencySymbol: '€'
),
);
expect($invoice)
->toBeInstanceOf(Invoice::class);
});
it('should can send invoice email to receiver', function () {
$repo = make(InvoiceRepo::class);
expect(
(function () use ($repo) {
$invoice_no = '517268';
$repo->send($invoice_no);
return true;
})(),
)->not->toThrow(Throwable::class);
});
it('should can download invoice pdf', function () {
$repo = make(InvoiceRepo::class);
$invoice_no = '517268';
$response = $repo->download($invoice_no);
expect($response)->toBeInstanceOf(ResponseInterface::class);
});

View File

@@ -10,16 +10,20 @@
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\ValueObject\PointPrice;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceProductRepo;
use function Hyperf\Support\make;
it('should can query case invoice product', function () {
/** @var InvoiceProductRepo $invoiceProductRepo */
$invoiceProductRepo = make(InvoiceProductRepo::class);
$caseId = '68affb136c01d';
$result = $invoiceProductRepo->getCaseProduct(caseId: $caseId);
expect($result)->toBeInstanceOf(InvoiceProduct::class);
expect($result)->toBeInstanceOf(InvoiceProduct::class)
->prices->toBeArray()
->each->toBeInstanceOf(PointPrice::class);
});

View File

@@ -0,0 +1,23 @@
<?php
/**
* QueryInvoiceDetailTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/9/5
*/
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceInfo;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceRepo;
use function Hyperf\Support\make;
it('should can query invoice detail', function () {
$repo = make(InvoiceRepo::class);
$invoiceNo = '517268';
$result = $repo->findOne($invoiceNo);
expect($result)
->toBeInstanceOf(InvoiceInfo::class);
});

View File

@@ -19,6 +19,20 @@ it('can query point rate', function () {
$from = PointType::FtaiAligner;
$to = PointType::LuxPoint;
$rate = $repo->getRate($from, $to);
$uid = 'cn3321';
$rate = $repo->getRate($from, $to, $uid);
expect($rate)->toBeFloat();
});
it('can query point rate with uid', function () {
$repo = make(ProductRepo::class);
$from = PointType::FtaiAligner;
$to = PointType::LuxPoint;
$uid = 'cn3321';
$rate = $repo->getRate($from, $to, $uid);
expect($rate)->toBeFloat();
});

View File

@@ -29,7 +29,7 @@ test('能够正常创建 Stripe 订单', function () {
service: 1
);
expect($order)->toBeInstanceOf(Order::class);
});
})->skip();
test('能够正常获取 Stripe 配置信息', function () {
/** @var StripeRpc $service */
@@ -40,4 +40,4 @@ test('能够正常获取 Stripe 配置信息', function () {
->toBeInstanceOf(StripeConfiguration::class)
->toHaveKeys(['id', 'pk'])
->and($configures->resolve())->toBeArray();
});
})->skip();