Merge branch 'gateway' of gitee.com:bootx/daxpay into union_pay

# Conflicts:
#	_doc/Task.md
#	daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/UnionPayController.java
#	daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java
#	daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayWayEnum.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/UnionPayWay.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/dao/RefundOrderManager.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/strategy/UnionPayReconcileStrategy.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/sdk/union/api/UnionPayKit.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/service/RefundSyncTaskService.java
This commit is contained in:
xxm1995
2024-03-14 20:17:37 +08:00
3 changed files with 8 additions and 2 deletions

View File

@@ -28,7 +28,7 @@ public enum PaySyncStatusEnum {
* 所以查询为了区分,增加一个未知的状态, 用于处理这种特殊情况, 然后根据业务需要,关闭订单或者进行其他操作
*/
NOT_FOUND_UNKNOWN("pay_not_found_unknown","交易不存在(特殊)"),
/** 订单到了超时时间, 不分情况可以进行手动设置支付超时状态 */
/** 订单到了超时时间, 可以进行手动设置支付超时状态 */
TIMEOUT("pay_timeout", "支付超时");
/** 编码 */