Compare commits

...

12 Commits

Author SHA1 Message Date
李东云
59b5118b93 chore(release): 1.2.7 2025-08-26 16:09:03 +08:00
李东云
c468fdda0e build: 更新发布流程以使用阿里云镜像源
- 修改 /etc/apt/sources.list 文件,将 Debian 官方镜像源替换为阿里云镜像源
- 更新 security.debian.org 为阿里云镜像源
- 这些更改旨在提高构建过程中的下载速度和可靠性
2025-08-26 16:08:50 +08:00
李东云
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
李东云
fd6548e144 chore(release): 1.2.5 2025-08-26 15:07:57 +08:00
李东云
acc3121320 fix(Sdk): 调整 WechatRpc 类中数组键名的命名风格
- 将 'goods_detail' 键名改为 'goodsDetail',采用驼峰命名法
- 将 'goods_name' 键名改为 'goodsName',同样采用驼峰命名法
2025-08-26 15:07:39 +08:00
李东云
b521e7c9e0 chore(release): 1.2.4 2025-08-21 18:18:31 +08:00
李东云
2276885ac1 refactor(transaction): 修改交易项中的价格字段名称
- 将 Item 类中的 'price' 字段重命名为 'unit_price'
- 更新 CallbackDomainSvc 中的回调函数,使用新的 'unit_price' 字段
2025-08-21 18:18:27 +08:00
李东云
8d2d3c8ba5 chore(release): 1.2.3 2025-08-20 20:00:51 +08:00
李东云
86939ea421 refactor(transaction): 重构交易信息构建方式
- 将 payType 和 type 字段的值存储为它们的 value 属性
-将 status 字段的值存储为它的 name 属性
2025-08-20 20:00:46 +08:00
李东云
960e3f1877 chore(release): 1.2.2 2025-08-20 19:36:33 +08:00
李东云
2ea5227185 fix(transaction): 修复回调服务中的商品价格字段
- 将 Item 类中的 price 字段从 $item['unit_price'] 修改为 $item['price']
- 确保回调服务正确使用商品的价格信息
2025-08-20 19:36:26 +08:00
7 changed files with 75 additions and 9 deletions

View File

@@ -17,6 +17,8 @@ jobs:
ls ${{ gitea.workspace }}
- name: Zip files in the repository
run: |
sed -i 's|deb.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list
sed -i 's|security.debian.org|mirrors.aliyun.com|g' /etc/apt/sources.list
apt-get update
apt-get install zip
zip -r dist.zip *

View File

@@ -1,4 +1,46 @@
# 版本更新日志
### [1.2.7](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.6...v1.2.7) (2025-08-26)
### 📦‍ Build System | 打包构建
* 更新发布流程以使用阿里云镜像源 ([c468fdd](http://124.126.16.154:8888/singularity/hdk-pay/commit/c468fdda0e4fd8bf5b2253527b368362ccb81954))
### [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)
### 🐛 Bug Fixes | Bug 修复
* **Sdk:** 调整 WechatRpc 类中数组键名的命名风格 ([acc3121](http://124.126.16.154:8888/singularity/hdk-pay/commit/acc3121320d74e2ea3423e3502779afde9675ee8))
### [1.2.4](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.3...v1.2.4) (2025-08-21)
### ♻️ Code Refactoring | 代码重构
* **transaction:** 修改交易项中的价格字段名称 ([2276885](http://124.126.16.154:8888/singularity/hdk-pay/commit/2276885ac1759a330eb6fb73e1158235edcac941))
### [1.2.3](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.2...v1.2.3) (2025-08-20)
### ♻️ Code Refactoring | 代码重构
* **transaction:** 重构交易信息构建方式 ([86939ea](http://124.126.16.154:8888/singularity/hdk-pay/commit/86939ea421d2f14c621da4e3bb86e3ab8d8b7d33))
### [1.2.2](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.1...v1.2.2) (2025-08-20)
### 🐛 Bug Fixes | Bug 修复
* **transaction:** 修复回调服务中的商品价格字段 ([2ea5227](http://124.126.16.154:8888/singularity/hdk-pay/commit/2ea52271852e4e009b044fb9baeb222b3a54c111))
### [1.2.1](http://124.126.16.154:8888/singularity/hdk-pay/compare/v1.2.0...v1.2.1) (2025-08-20)

View File

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

View File

@@ -23,7 +23,7 @@ final class Item extends ArrayObject
parent::__construct([
'name' => $name,
'quantity' => $quantity,
'price' => $price,
'unit_price' => $price,
]);
}

View File

@@ -34,10 +34,10 @@ abstract class Transaction extends ArrayObject
) {
parent::__construct(
[
'pay_type' => $payType,
'type' => $type,
'pay_type' => $payType->value,
'type' => $type->value,
'amount' => $amount,
'status' => $status,
'status' => $status->name,
],
);
}

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];

View File

@@ -76,8 +76,8 @@ final class WechatRpc
'amount' => (int)$money->getAmount(),
'fileType' => $type,
'uid' => $uid,
'goods_detail' => [
'goods_name' => $goodsName,
'goodsDetail' => [
'goodsName' => $goodsName,
],
'number' => $number,
],