Compare commits

...

22 Commits

Author SHA1 Message Date
李东云
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
李东云
5a4edf9258 chore(release): 1.5.1 2025-09-01 17:25:38 +08:00
李东云
d17a67f58e feat(RechargeProductRepoInterface): 添加查找 FTAI 产品的方法
- 在 RechargeProductRepoInterface接口中添加了 findFtaiProduct 方法
- 新方法用于根据 UID 和点数类型查找 FTAI 产品
- 引入了 PointType 枚举类
2025-09-01 17:25:20 +08:00
李东云
23aa9b68bf chore(release): 1.5.0 2025-09-01 17:18:31 +08:00
李东云
48f44f4c4c feat(product): 支持查询 FTAI 产品
- 新增 findFtaiProduct 方法,用于查询 FTAI 产品信息
- 修改 RechargeProductsDto 以支持 FTAI 产品的特殊逻辑
- 更新 ProductItem 实体,允许 effect 属性为 null
- 调整产品价格的处理方式,确保精度正确
-增加 FTAI 产品查询的单元测试
2025-09-01 17:18:01 +08:00
李东云
25612823a5 chore(release): 1.4.1 2025-08-29 11:28:58 +08:00
李东云
c8681a6d54 refactor(invoice): 移除 getCaseProduct 方法中未使用的参数
- 从 InvoiceProductRepoInterface 和 InvoiceProductRepo 中移除了 getCaseProduct 方法的 $uid 参数
- 更新了 QueryCaseInvoiceProductTest 中的测试用例,移除了 $uid 相关的代码- 调整了 API 请求的路径,从 "/rpc/v2/account/$uid/logs/points/$caseId/product" 改为 "/rpc/v2/invoice/$caseId/product"
2025-08-29 11:28:43 +08:00
李东云
c8f3acd62b chore(release): 1.4.0 2025-08-29 04:02:57 +08:00
李东云
d3b861a7f7 feat(invoice): 添加查询用户常用发票地址功能
- 新增 FrequentAddress 类表示常用地址
- 添加 FrequentAddressRepoInterface 接口和 FrequentAddressRepo 实现类
- 在 ConfigProvider 中注册 FrequentAddressRepo
- 编写单元测试验证查询功能
2025-08-29 04:02:48 +08:00
李东云
630d4ba7a4 refactor(invoice): 重构发票相关类的命名空间
-将 ValueObject 目录下的类移动到 Invoice 目录下
- 更新相关的命名空间
- 修改使用这些类的文件,以适应新的命名空间
2025-08-29 03:50:47 +08:00
李东云
b3317c5f8d feat(invoice): 添加创建发票功能
- 新增 CreateInvoiceCmd 类作为创建发票的命令对象
- 创建 Address 类表示发票地址信息
- 实现 Invoice 类作为发票的领域模型
- 添加 InvoiceRepoInterface 接口和 InvoiceRepo 实现类,用于处理发票创建逻辑
- 编写 CreateInvoiceTest测试用例验证发票创建功能
2025-08-29 01:42:42 +08:00
李东云
66a468e702 refactor(invoice): 更新 InvoiceProduct 类的位置
- 将 InvoiceProduct 类从 ValueObject 目录移动到 Aggregate/ValueObject 目录
- 更新类的命名空间以反映新的目录结构
2025-08-29 01:05:32 +08:00
李东云
dd212ad8a2 feat(invoice): 新增发票商品查询功能
- 添加 InvoiceProductRepoInterface 接口用于获取发票商品信息
- 实现 InvoiceProductRepo 类,通过 API 请求获取发票商品数据
- 创建 InvoiceProduct 类作为发票商品的价值对象
- 在 ConfigProvider 中注册 InvoiceProductRepo
- 添加单元测试 QueryCaseInvoiceProductTest 验证功能正确性
2025-08-28 18:52:49 +08:00
李东云
0d4f561ef0 chore(release): 1.3.1 2025-08-27 17:04:54 +08:00
李东云
aa8742923c refactor(account): 优化点数日志仓库接口和实现类
- 在 PointLogRepoInterface 中添加了空行,提高代码可读性
- 在 PointLogRepo 中移除了未使用的 PointType 引用,减少冗余代码
2025-08-27 17:04:40 +08:00
李东云
738d225fd8 chore(release): 1.3.0 2025-08-27 11:31:41 +08:00
李东云
38ce644c73 feat(account): 添加积分日志相关功能
- 新增 PointLog 类用于表示积分日志实体
- 添加 PointAction 枚举类,定义积分操作类型
- 实现 PointLogRepoInterface 接口,提供积分日志查询功能
- 在 ConfigProvider 中注册 PointLogRepo
- 编写单元测试以验证积分日志查询功能
2025-08-27 11:30:48 +08:00
李东云
f2a51fa1da refactor(Account): 重构账户相关类的命名空间
- 将 AccountBalance 和 PointsBalance 类移动到新的命名空间
- 更新相关文件中的 use 语句以适应新的命名空间
- 此改动仅影响文件组织结构,不改变类的功能或接口
2025-08-27 11:06:52 +08:00
35 changed files with 935 additions and 44 deletions

View File

@@ -1,4 +1,74 @@
# 版本更新日志
### [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)
### ✨ Features | 新功能
* **RechargeProductRepoInterface:** 添加查找 FTAI 产品的方法 ([d17a67f](http://124.126.16.154:8888/singularity/hdk-pay/commit/d17a67f58ee2772191e30eb52c09923f43425989))
## [1.5.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.4.1...v1.5.0) (2025-09-01)
### ✨ Features | 新功能
* **product:** 支持查询 FTAI 产品 ([48f44f4](http://124.126.16.154:8888/singularity/hdk-pay/commit/48f44f4c4ceef95e7315ce52924ea3729f8214f5))
### [1.4.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.4.0...v1.4.1) (2025-08-29)
### ♻️ Code Refactoring | 代码重构
* **invoice:** 移除 getCaseProduct 方法中未使用的参数 ([c8681a6](http://124.126.16.154:8888/singularity/hdk-pay/commit/c8681a6d5445b8b9177a236e41aee25d63d50315))
## [1.4.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.3.1...v1.4.0) (2025-08-28)
### ♻️ Code Refactoring | 代码重构
* **invoice:** 更新 InvoiceProduct 类的位置 ([66a468e](http://124.126.16.154:8888/singularity/hdk-pay/commit/66a468e702a0b550ce7445c66164b10b4edcc41a))
* **invoice:** 重构发票相关类的命名空间 ([630d4ba](http://124.126.16.154:8888/singularity/hdk-pay/commit/630d4ba7a427bc7bece24093f783634d3e707b2f))
### ✨ Features | 新功能
* **invoice:** 新增发票商品查询功能 ([dd212ad](http://124.126.16.154:8888/singularity/hdk-pay/commit/dd212ad8a26f03f2b6e204e5485120e267ba73a2))
* **invoice:** 添加创建发票功能 ([b3317c5](http://124.126.16.154:8888/singularity/hdk-pay/commit/b3317c5f8d65aae811130f4af9d09cce514047ff))
* **invoice:** 添加查询用户常用发票地址功能 ([d3b861a](http://124.126.16.154:8888/singularity/hdk-pay/commit/d3b861a7f75281168ec16562aec290f1904fda7e))
### [1.3.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.3.0...v1.3.1) (2025-08-27)
### ♻️ Code Refactoring | 代码重构
* **account:** 优化点数日志仓库接口和实现类 ([aa87429](http://124.126.16.154:8888/singularity/hdk-pay/commit/aa8742923c38ae90386c83b8a280a47dacc3537b))
## [1.3.0](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.7...v1.3.0) (2025-08-27)
### ♻️ Code Refactoring | 代码重构
* **Account:** 重构账户相关类的命名空间 ([f2a51fa](http://124.126.16.154:8888/singularity/hdk-pay/commit/f2a51fa1da67d5169761bc47cbe2b6da605051ae))
### ✨ Features | 新功能
* **account:** 添加积分日志相关功能 ([38ce644](http://124.126.16.154:8888/singularity/hdk-pay/commit/38ce644c7351740641901a0497351f45c0119339))
### [1.2.7](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.6...v1.2.7) (2025-08-26)

View File

@@ -70,5 +70,5 @@
"url": "https://mirrors.aliyun.com/composer/"
}
},
"version": "1.2.7"
"version": "1.5.3"
}

View File

@@ -0,0 +1,26 @@
<?php
/**
* CreateInvoiceCmd.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Application\Command;
final readonly class CreateInvoiceCmd {
public function __construct(
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,
) {}
}

View File

@@ -43,28 +43,36 @@ final class RechargeProductsDto extends AbstractDto
$effect = $product->effect;
$price = $product->unitPrice;
return [
$result = [
'id' => $product->id,
'name' => $product->description,
'currency' => $price->getCurrency()->getCode(),
'price' => (float)$price->getAmount(),
'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,
)),
'point' => [
'total' => $effect->getPointTotal(),
'number' => $effect->pointBasic,
'bonus' => $effect->pointBonus,
],
'price' => (float)bcdiv($price->getAmount(), '100', 2),
];
$is_ftai = empty($effect);
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,
)),
'point' => [
'total' => $effect->getPointTotal(),
'number' => $effect->pointBasic,
'bonus' => $effect->pointBonus,
],
];
}
return $result;
}
}

View File

@@ -7,11 +7,19 @@ namespace Singularity\HDK\Pay;
use Hyperf\Contract\StdoutLoggerInterface;
use Hyperf\Framework\Logger\StdoutLogger;
use Singularity\HDK\Pay\Domain\Account\Repository\AccountRepoInterface;
use Singularity\HDK\Pay\Domain\Account\Repository\PointLogRepoInterface;
use Singularity\HDK\Pay\Domain\Invoice\Repository\FrequentAddressRepoInterface;
use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceProductRepoInterface;
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\FrequentAddressRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceProductRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\OrderRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\PointLogRepo;
use Singularity\HDK\Pay\Infrastructure\Repository\ProductRepo;
/**
@@ -30,11 +38,22 @@ class ConfigProvider
'dependencies' => [
StdoutLoggerInterface::class => StdoutLogger::class,
// Command
// Repo
// account
AccountRepoInterface::class => AccountBalanceRepo::class,
PointLogRepoInterface::class => PointLogRepo::class,
// product
ExchangeRepoInterface::class => ProductRepo::class,
RechargeProductRepoInterface::class => ProductRepo::class,
// transaction
OrderRepoInterface::class => OrderRepo::class,
// invoice
InvoiceProductRepoInterface::class => InvoiceProductRepo::class,
InvoiceRepoInterface::class => InvoiceRepo::class,
FrequentAddressRepoInterface::class => FrequentAddressRepo::class,
],
// 合并到 config/autoload/annotations.php 文件
'annotations' => [

View File

@@ -9,9 +9,7 @@
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Aggregate;
use Singularity\HDK\Pay\Domain\Account\Aggregate\ValueObject\PointsBalance;
namespace Singularity\HDK\Pay\Domain\Account\Aggregate\Account;
/**
* Singularity\HDK\Pay\Domain\Account\Aggregate\AccountBalance@Pay
@@ -27,7 +25,7 @@ final readonly class AccountBalance
{
/**
* @param string $uid
* @param TPointsBalances $pointsBalances
* @param PointsBalance $pointsBalances
*/
public function __construct(
private string $uid,

View File

@@ -9,7 +9,7 @@
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Aggregate\ValueObject;
namespace Singularity\HDK\Pay\Domain\Account\Aggregate\Account;
use Carbon\Carbon;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;

View File

@@ -0,0 +1,70 @@
<?php
/**
* PointLog.php@LuxPay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/21
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog;
use Carbon\Carbon;
use Singularity\HDK\Pay\Domain\AggregateRoot;
final class PointLog extends AggregateRoot
{
public function __construct(
private readonly int $id,
private readonly string $caseId,
private readonly string $uid,
private readonly float $credits,
private readonly string $source,
private readonly string $operator,
private readonly string $description,
private readonly Carbon $date,
) {}
public function getDescription(): string
{
return $this->description;
}
public function getSource(): string
{
return $this->source;
}
public function getDate(): Carbon
{
return $this->date;
}
public function getUid(): string
{
return $this->uid;
}
public function getCredits(): float
{
return $this->credits;
}
public function getOperator(): string
{
return $this->operator;
}
public function getCaseId(): ?string
{
return $this->caseId;
}
public function getId(): ?int
{
return $this->id;
}
}

View File

@@ -0,0 +1,35 @@
<?php
/**
* PointAction.php@LuxPay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/21
*/
namespace Singularity\HDK\Pay\Domain\Account\Enum;
enum PointAction
{
case Initial;
case Deduct;
case Refund;
case Increase;
case Clear;
public static function tryFrom(string $action): ?PointAction
{
return match (strtolower($action)) {
'initial' => self::Initial,
'deduct' => self::Deduct,
'refund' => self::Refund,
'increase' => self::Increase,
'clear' => self::Clear,
default => null,
};
}
}

View File

@@ -11,8 +11,8 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Account\Repository;
use Singularity\HDK\Pay\Domain\Account\Aggregate\AccountBalance;
use Singularity\HDK\Pay\Domain\Account\Aggregate\ValueObject\PointsBalance;
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;
interface AccountRepoInterface

View File

@@ -0,0 +1,22 @@
<?php
/**
* PointLogRepoInterface.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/27
*/
namespace Singularity\HDK\Pay\Domain\Account\Repository;
use Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\PointLog;
interface PointLogRepoInterface
{
/**
* @param string $uid
* @return PointLog[]
*/
public function getList(string $uid): array;
}

View File

@@ -0,0 +1,56 @@
<?php
/**
* QueryFreqAddrDto.php@LuxPay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Address;
use Singularity\HDK\Pay\Domain\AggregateRoot;
final class FrequentAddress extends AggregateRoot
{
public function __construct(
private readonly string $uid,
private readonly string $address,
private readonly string $city,
private readonly string $state,
private readonly string $country,
private readonly string $zipCode,
) {}
public function getUid(): string
{
return $this->uid;
}
public function getAddress(): string
{
return $this->address;
}
public function getCity(): string
{
return $this->city;
}
public function getState(): string
{
return $this->state;
}
public function getCountry(): string
{
return $this->country;
}
public function getZipCode(): string
{
return $this->zipCode;
}
}

View File

@@ -0,0 +1,53 @@
<?php
/**
* Address.php@LuxPay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/28
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
final readonly class Address {
public function __construct(
private string $patientName,
private string $address,
private string $city,
private string $state,
private string $country,
private string $zipCode,
) {}
public function getPatientName(): string
{
return $this->patientName;
}
public function getAddress(): string
{
return $this->address;
}
public function getCity(): string
{
return $this->city;
}
public function getState(): string
{
return $this->state;
}
public function getCountry(): string
{
return $this->country;
}
public function getZipCode(): string
{
return $this->zipCode;
}
}

View File

@@ -0,0 +1,81 @@
<?php
/**
* InvoiceDto.php@LuxPay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/28
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
use Singularity\HDK\Pay\Domain\AggregateRoot;
final class Invoice extends AggregateRoot
{
public function __construct(
private readonly string $invoiceNo,
private readonly string $uid,
private readonly string $caseId,
private readonly Address $address,
private readonly bool $setFreqInvAddr,
private readonly string $receiver,
) {}
public function getInvoiceNo(): string
{
return $this->invoiceNo;
}
public function getUid(): string
{
return $this->uid;
}
public function getCaseId(): string
{
return $this->caseId;
}
public function isSetFreqInvAddr(): bool
{
return $this->setFreqInvAddr;
}
public function getReceiver(): string
{
return $this->receiver;
}
public function getPatientName(): string
{
return $this->address->getPatientName();
}
public function getAddress(): string
{
return $this->address->getAddress();
}
public function getCity(): string
{
return $this->address->getCity();
}
public function getState(): string
{
return $this->address->getState();
}
public function getCountry(): string
{
return $this->address->getCountry();
}
public function getZipCode(): string
{
return $this->address->getZipCode();
}
}

View File

@@ -0,0 +1,22 @@
<?php
/**
* InvoiceProduct.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/28
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
final readonly class InvoiceProduct {
public function __construct(
public string $caseId,
public string $uid,
public string $name,
public string $sku,
public string $description,
) {}
}

View File

@@ -0,0 +1,21 @@
<?php
/**
* FrequentAddressRepoInterface.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
namespace Singularity\HDK\Pay\Domain\Invoice\Repository;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Address\FrequentAddress;
interface FrequentAddressRepoInterface
{
/**
* @param string $uid
* @return FrequentAddress
*/
public function findByUser(string $uid): FrequentAddress;
}

View File

@@ -0,0 +1,21 @@
<?php
/**
* InvoiceProductRepoInterface.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/28
*/
namespace Singularity\HDK\Pay\Domain\Invoice\Repository;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
interface InvoiceProductRepoInterface
{
/**
* @param string $caseId
* @return InvoiceProduct
*/
public function getCaseProduct(string $caseId): InvoiceProduct;
}

View File

@@ -0,0 +1,22 @@
<?php
/**
* InvoiceRepoInterface.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
namespace Singularity\HDK\Pay\Domain\Invoice\Repository;
use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
interface InvoiceRepoInterface
{
/**
* @param CreateInvoiceCmd $cmd
* @return Invoice
*/
public function create(CreateInvoiceCmd $cmd): Invoice;
}

View File

@@ -22,6 +22,6 @@ final class ProductItem
public string $description,
public Money $unitPrice,
public ProductType $productType,
public RechargeEffect $effect,
public ?RechargeEffect $effect = null,
) {}
}

View File

@@ -9,6 +9,7 @@
namespace Singularity\HDK\Pay\Domain\Product\Repository;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Domain\Product\Aggregate\RechargeProduct;
interface RechargeProductRepoInterface
@@ -23,4 +24,11 @@ interface RechargeProductRepoInterface
* @return RechargeProduct
*/
public function findEmaProduct(string $uid): RechargeProduct;
/**
* @param string $uid
* @param PointType $pointType
* @return RechargeProduct
*/
public function findFtaiProduct(string $uid, PointType $pointType): RechargeProduct;
}

View File

@@ -11,9 +11,10 @@ declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Carbon\Carbon;
use Hyperf\Codec\Json;
use Singularity\HDK\Pay\Domain\Account\Aggregate\AccountBalance;
use Singularity\HDK\Pay\Domain\Account\Aggregate\ValueObject\PointsBalance;
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;
@@ -41,7 +42,7 @@ final class AccountBalanceRepo extends AbstractRepo implements AccountRepoInterf
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 +64,7 @@ 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,
);
}
}

View File

@@ -0,0 +1,41 @@
<?php
/**
* FrequentAddressRepo.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Hyperf\Codec\Json;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Address\FrequentAddress;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
use Singularity\HDK\Pay\Domain\Invoice\Repository\FrequentAddressRepoInterface;
use Singularity\HDK\Pay\Infrastructure\Repository\AbstractRepo;
final class FrequentAddressRepo extends AbstractRepo implements FrequentAddressRepoInterface
{
/**
* @inheritDoc
*/
public function findByUser(string $uid): FrequentAddress
{
$response = $this->requestService->requestGet("/rpc/v2/account/$uid/inv-addr");
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new FrequentAddress(
uid: $result['uid'],
address: $result['address'],
city: $result['city'],
state: $result['state'],
country: $result['country'],
zipCode: $result['zip']
);
}
}

View File

@@ -0,0 +1,38 @@
<?php
/**
* InvoiceProductRepo.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/28
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Hyperf\Codec\Json;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceProductRepoInterface;
final class InvoiceProductRepo extends AbstractRepo implements InvoiceProductRepoInterface
{
/**
* @inheritDoc
*/
public function getCaseProduct(string $caseId): InvoiceProduct
{
$response = $this->requestService->requestGet("/rpc/v2/invoice/$caseId/product");
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new InvoiceProduct(
caseId: $result['case_id'],
uid: $result['uid'],
name: $result['name'],
sku: $result['sku'],
description: $result['description'],
);
}
}

View File

@@ -0,0 +1,57 @@
<?php
/**
* InvoiceRepo.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Hyperf\Codec\Json;
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\Repository\InvoiceRepoInterface;
final class InvoiceRepo extends AbstractRepo implements InvoiceRepoInterface
{
public function create(CreateInvoiceCmd $cmd): Invoice
{
$response = $this->requestService->requestPost(
url: "/rpc/v2/account/logs/points/$cmd->caseId/invoices",
data: [
'set_freq_addr' => $cmd->setFreqInvAddr,
'receiver' => $cmd->receiver,
'patient_name' => $cmd->patientName,
'address' => $cmd->address,
'city' => $cmd->city,
'state' => $cmd->state,
'country' => $cmd->country,
'zip' => $cmd->zipCode,
],
);
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new Invoice(
invoiceNo: $result['invoice_no'],
uid: $result['uid'],
caseId: $result['case_id'],
address: new Address(
patientName: $result['patient_name'],
address: $result['address'],
city: $result['city'],
state: $result['state'],
country: $result['country'],
zipCode: $result['zip'],
),
setFreqInvAddr: $result['set_freq_addr'],
receiver: $result['receiver'],
);
}
}

View File

@@ -0,0 +1,43 @@
<?php
/**
* PointLogRepo.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/27
*/
declare(strict_types=1);
namespace Singularity\HDK\Pay\Infrastructure\Repository;
use Carbon\Carbon;
use Hyperf\Codec\Json;
use Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\PointLog;
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, ?PointType $type = null): array
{
$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);
return array_map(function ($item) {
return new PointLog(
id: $item['id'],
caseId: $item['case_id'],
uid: $item['uid'],
credits: $item['credits'],
source: $item['source'],
operator: $item['operator'],
description: $item['description'],
date: new Carbon($item['date']),
);
}, $result);
}
}

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: $result['one_time']['price'],
amount:bcmul((string)$result['one_time']['price'], '100'),
currency: new Currency($result['one_time']['currency']),
),
productType: ProductType::oneTime,
@@ -59,7 +59,7 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: $item['price'],
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
),
productType: ProductType::pack,
@@ -72,6 +72,59 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
);
}
public function findFtaiProduct(string $uid, PointType $pointType): RechargeProduct
{
$response = $this->requestService->requestGet(
url: '/rpc/v2/products/ftai',
params: ['uid' => $uid, 'type' => $pointType->value],
);
$content = $response->getBody()->getContents();
$result = Json::decode($content);
return new RechargeProduct(
oneTime: isset($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'),
currency: new Currency($result['one_time']['currency']),
),
productType: ProductType::oneTime,
effect: new RechargeEffect(
pointType: $pointType,
pointBasic: $result['one_time']['point']['number'],
pointBonus: $result['one_time']['point']['bonus'],
),
)
: 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']),
),
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']),
),
productType: ProductType::plan,
effect: new RechargeEffect(
pointType: $pointType,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),
), $result['package']),
);
}
/**
* @inheritDoc
*/
@@ -91,7 +144,7 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
id: $result['one_time']['id'],
description: $result['one_time']['name'],
unitPrice: new Money(
amount: $result['one_time']['price'],
amount:bcmul((string)$result['one_time']['price'], '100'),
currency: new Currency($result['one_time']['currency']),
),
productType: ProductType::oneTime,
@@ -107,7 +160,7 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
id: $result['renew']['id'],
description: $result['renew']['name'],
unitPrice: new Money(
amount: $result['renew']['price'],
amount: bcmul((string)$result['renew']['price'], '100'),
currency: new Currency($result['renew']['currency']),
),
productType: ProductType::renew,
@@ -122,12 +175,12 @@ final class ProductRepo extends AbstractRepo implements RechargeProductRepoInter
id: $item['id'],
description: $item['name'],
unitPrice: new Money(
amount: $item['price'],
amount: bcmul((string)$item['price'], '100'),
currency: new Currency($item['currency']),
),
productType: ProductType::plan,
effect: new RechargeEffect(
pointType: PointType::LuxPoint,
pointType: PointType::EMA,
pointBasic: $item['point']['number'],
pointBonus: $item['point']['bonus'],
),

View File

@@ -8,7 +8,7 @@
* Created on 2025/8/18
*/
use Singularity\HDK\Pay\Domain\Account\Aggregate\AccountBalance;
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\AccountBalance;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountBalanceRepo;
use function Hyperf\Support\make;

View File

@@ -8,7 +8,7 @@
* Created on 2025/8/18
*/
use Singularity\HDK\Pay\Domain\Account\Aggregate\ValueObject\PointsBalance;
use Singularity\HDK\Pay\Domain\Account\Aggregate\Account\PointsBalance;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Infrastructure\Repository\AccountBalanceRepo;

View File

@@ -0,0 +1,25 @@
<?php
/**
* QueryPointLogListTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/27
*/
use Singularity\HDK\Pay\Domain\Account\Aggregate\PointLog\PointLog;
use Singularity\HDK\Pay\Infrastructure\Repository\PointLogRepo;
use function Hyperf\Support\make;
it('should can query point log list', function () {
$uid = '61a74db54f387';
$repo = make(PointLogRepo::class);
$list = $repo->getList($uid);
expect($list)
->not->toBeEmpty()
->each
->toBeInstanceOf(PointLog::class);
});

View File

@@ -0,0 +1,36 @@
<?php
/**
* CreateInvoiceTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceRepo;
use function Hyperf\Support\make;
it('should can create invoice', function () {
$repo = make(InvoiceRepo::class);
$invoice = $repo->create(
new CreateInvoiceCmd(
caseId: '68affb136c01d',
setFreqInvAddr: true,
receiver: "dongyun.li@luxcreo.ai",
patientName: "Ms. Jennifer Durgan",
address: "12345 Magnolia Boulevard NortheastApartment 5678 Suite 910",
city: "Springfield",
state: "Illinois",
country: "United States",
zipCode: "67890-1234",
),
);
expect($invoice)
->toBeInstanceOf(Invoice::class);
});

View File

@@ -0,0 +1,25 @@
<?php
/**
* QueryCaseInvoiceProductTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/28
*/
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceProductRepo;
use function Hyperf\Support\make;
it('should can query case invoice product', function () {
$invoiceProductRepo = make(InvoiceProductRepo::class);
$caseId = '68affb136c01d';
$result = $invoiceProductRepo->getCaseProduct(caseId: $caseId);
expect($result)->toBeInstanceOf(InvoiceProduct::class);
});

View File

@@ -0,0 +1,23 @@
<?php
/**
* QueryFreqAddrTest.php@Pay
*
* @author 李东云 <Dongyun.Li@LuxCreo.Ai>
* Powered by PhpStorm
* Created on 2025/8/29
*/
use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Address\FrequentAddress;
use Singularity\HDK\Pay\Infrastructure\Repository\FrequentAddressRepo;
use function Hyperf\Support\make;
it('should can query frequent invoice address', function () {
$uid = '61dbe752d4caa';
$addrRepo = make(FrequentAddressRepo::class);
$freq_addr = $addrRepo->findByUser($uid);
expect($freq_addr)->toBeInstanceOf(FrequentAddress::class);
});

View File

@@ -9,6 +9,7 @@
*/
use Pest\Expectation;
use Singularity\HDK\Pay\Domain\Account\Enum\PointType;
use Singularity\HDK\Pay\Domain\Product\Aggregate\Entities\ProductItem;
use Singularity\HDK\Pay\Domain\Product\Aggregate\RechargeProduct;
use Singularity\HDK\Pay\Infrastructure\Repository\ProductRepo;
@@ -44,3 +45,19 @@ it('should can query EMA products', function () {
)
->and($products->getPlans())->each->toBeInstanceOf(ProductItem::class);
});
it('should can query FTAI products', function () {
$repo = make(ProductRepo::class);
$uid = '61efabc21e5a2';
$products = $repo->findFtaiProduct($uid, PointType::FtaiAligner);
expect($products)
->toBeInstanceOf(RechargeProduct::class)
->when(
$products->getOneTime() !== null,
fn(Expectation $expectation) => $expectation
->and($products->getOneTime())->toBeInstanceOf(ProductItem::class),
)
->and($products->getPackages())->each->toBeInstanceOf(ProductItem::class)
->and($products->getPlans())->each->toBeInstanceOf(ProductItem::class);
});

View File

@@ -32,4 +32,4 @@ test(
);
expect($goods)->toBeInstanceOf(Goods::class);
}
);
)->skip();

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();