From 53808352fbcad9f624552ae73dd3071f1749904d Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 24 Jun 2024 16:23:12 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=BD=AC=E8=B4=A6=E6=BC=94=E7=A4=BA?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _doc/Task.md                                          |  2 ++
 .../controller/order/TransferOrderController.java     | 11 ++++++++---
 .../core/param/payment/transfer/TransferParam.java    |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/_doc/Task.md b/_doc/Task.md
index f573a7d9..febb18b1 100644
--- a/_doc/Task.md
+++ b/_doc/Task.md
@@ -4,6 +4,7 @@
 - [x] 增加转账接口功能
 - [x] 转账订单前端页面
 - [ ] DEMO增加转账演示功能
+- [x] DEMO增加获取OpenID功能
 - [x] 手动发起分账重试参数修正
 - [x] 细分各种支付异常类和编码(部分+初版)
 - [x] 支付宝支持JSAPI方式支付
@@ -42,6 +43,7 @@
 - [x] 支付和退款达到终态不可以再回退回之前的状态
 - [x] 修复支付关闭参数名称不正确问题
 - [X] 去除消息通知模块
+- [x] 优化认证授权地址配置, 拆分为支持单独配置
 - [x] 退款回调消息字段不一致导致验签不通过问题
 
 2.0.9: 消息通知改版和系统优化
diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/daxpay/single/admin/controller/order/TransferOrderController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/daxpay/single/admin/controller/order/TransferOrderController.java
index da4f6729..f019f281 100644
--- a/daxpay-single/daxpay-single-admin/src/main/java/cn/daxpay/single/admin/controller/order/TransferOrderController.java
+++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/daxpay/single/admin/controller/order/TransferOrderController.java
@@ -4,8 +4,10 @@ import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
+import cn.bootx.platform.common.core.util.ValidationUtil;
 import cn.daxpay.single.core.code.PaymentApiCode;
 import cn.daxpay.single.core.param.payment.transfer.TransferParam;
+import cn.daxpay.single.core.result.transfer.TransferResult;
 import cn.daxpay.single.service.annotation.InitPaymentContext;
 import cn.daxpay.single.service.core.order.transfer.service.TransferOrderQueryService;
 import cn.daxpay.single.service.core.payment.transfer.service.TransferService;
@@ -16,6 +18,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+
 /**
  * 转账订单控制器
  * @author xxm
@@ -58,9 +62,10 @@ public class TransferOrderController {
     @InitPaymentContext(PaymentApiCode.TRANSFER)
     @Operation(summary = "手动发起转账")
     @PostMapping("/transfer")
-    public ResResult<Void> transfer(@RequestBody TransferParam param){
-        transferService.transfer(param);
-        return Res.ok();
+    public ResResult<TransferResult> transfer(@RequestBody TransferParam param){
+        param.setReqTime(LocalDateTime.now());
+        ValidationUtil.validateParam(param);
+        return Res.ok(transferService.transfer(param));
     }
 
     @InitPaymentContext(PaymentApiCode.TRANSFER)
diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/param/payment/transfer/TransferParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/param/payment/transfer/TransferParam.java
index c7aff50c..75902e96 100644
--- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/param/payment/transfer/TransferParam.java
+++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/core/param/payment/transfer/TransferParam.java
@@ -41,7 +41,7 @@ public class TransferParam extends PaymentCommonParam {
 
     /** 转账金额 */
     @NotNull(message = "转账金额必填")
-    @Min(value = 1, message = "转账金额至少为0.01")
+    @Min(value = 1, message = "转账金额至少为0.01元")
     @Schema(description = "转账金额")
     private Integer amount;