Compare commits

...

2 Commits

Author SHA1 Message Date
李东云
24709acf09 chore(release): 1.2.6 2025-08-26 16:02:42 +08:00
李东云
f141989a8d refactor(Order): 重构订单资源以支持经典订单解析
- 新增 parseClassicOrder 方法用于解析经典订单
- 修改 toArray 方法,根据订单类型选择性调用 parseClassicOrder
- 引入 Money库以处理金额和货币
2025-08-26 16:02:31 +08:00
3 changed files with 32 additions and 3 deletions

View File

@@ -1,4 +1,11 @@
# 版本更新日志
### [1.2.6](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.5...v1.2.6) (2025-08-26)
### ♻️ Code Refactoring | 代码重构
* **Order:** 重构订单资源以支持经典订单解析 ([f141989](http://124.126.16.154:8888/singularity/hdk-pay/commit/f141989a8d7c6055d0d740619cc0660a1ea0ef7f))
### [1.2.5](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.4...v1.2.5) (2025-08-26)

View File

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

View File

@@ -2,9 +2,9 @@
namespace Singularity\HDK\Pay\Resource\V2;
use App\Model\ServiceProvider;
use Carbon\Carbon;
use Hyperf\Resource\Json\JsonResource;
use Money\Currency;
use Money\Money;
use Singularity\HDK\Pay\Enum\OrderStatus;
use stdClass;
@@ -48,6 +48,9 @@ class Order extends JsonResource
*/
public function toArray(): array
{
if (empty($this->resource['order_no'])) {
return $this->parseClassicOrder();
}
return [
'order_no' => $this->order_no,
'state' => $this->state,
@@ -65,6 +68,25 @@ class Order extends JsonResource
];
}
private function parseClassicOrder(): array
{
return [
'order_no' => $this->orderNo,
'state' => $this->state,
'transaction_id' => $this->transactionId,
'uid' => $this->uid,
'method' => $this->payment,
'description' => $this->goodsName,
'total_amount' => new Money($this->amount['amount'], new Currency($this->amount['currency'])),
'currency' => $this->amount['currency'],
'items' => [],
'external' => [],
'remark' => $this->remark,
'notification' => $this->notification ?? [],
'more_details' => [],
];
}
public function __get($key)
{
return $this->resource->{$key} ?? $this->resource[$key];