From 6dcea22529e311150c3f3e72a4ab85880e1329e8 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 13 Jul 2026 18:30:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor(trade):=20=E6=94=B6=E6=95=9B=E7=BD=91?= =?UTF-8?q?=E5=85=B3=E5=AE=B9=E5=99=A8=E4=B8=8E=20runtime=20close=20?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 GatewayPayOrder 持久化迁入 trade.order，与 NormalPayOrder 统一为业务容器； 将 runtime.close 拆为 service.close / job / consumer，与 pay/refund/sync 对称。 --- .../trade/GatewayPayOrderAdminController.java | 4 ++-- .../service/trade/GatewayPayOrderAdminService.java | 12 ++++++------ .../service/trade/NormalPayOrderAdminService.java | 2 +- .../admin/service/trade/PayTradeAdminService.java | 2 +- .../order}/convert/GatewayPayOrderConvert.java | 6 +++--- .../order}/dao/GatewayPayOrderManager.java | 6 +++--- .../order}/dao/GatewayPayOrderMapper.java | 4 ++-- .../order}/entity/GatewayPayOrder.java | 3 ++- .../payment/trade/order/entity/NormalPayOrder.java | 1 + .../order}/param/GatewayPayOrderQuery.java | 2 +- .../order}/result/GatewayPayOrderResult.java | 2 +- .../{close => }/consumer/GatewayTimeoutConsumer.java | 4 ++-- .../consumer/NormalPayTimeoutConsumer.java | 4 ++-- .../runtime/{close => }/job/GatewayTimeoutJob.java | 10 +++++----- .../runtime/{close => }/job/NormalPayTimeoutJob.java | 4 ++-- .../runtime/service/ContainerFieldResolver.java | 4 ++-- .../runtime/service/callback/PayCallbackService.java | 4 ++-- .../close}/GatewayTimeoutService.java | 6 +++--- .../service => service/close}/PayCloseService.java | 6 +++--- .../runtime/service/pay/PayUniHandleService.java | 4 ++-- .../trade/runtime/service/sync/PaySyncService.java | 4 ++-- .../gateway/service/GatewayAggregatePayService.java | 2 +- .../gateway/service/GatewayOrderQueryService.java | 4 ++-- .../gateway/service/GatewayPayAssistService.java | 4 ++-- .../gateway/service/GatewayPayHandleService.java | 10 +++++----- .../unipay/trade/controller/UniTradeController.java | 2 +- 26 files changed, 59 insertions(+), 57 deletions(-) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{gateway => trade/order}/convert/GatewayPayOrderConvert.java (61%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{gateway => trade/order}/dao/GatewayPayOrderManager.java (93%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{gateway => trade/order}/dao/GatewayPayOrderMapper.java (65%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{gateway => trade/order}/entity/GatewayPayOrder.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{gateway => trade/order}/param/GatewayPayOrderQuery.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/{gateway => trade/order}/result/GatewayPayOrderResult.java (97%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/{close => }/consumer/GatewayTimeoutConsumer.java (91%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/{close => }/consumer/NormalPayTimeoutConsumer.java (94%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/{close => }/job/GatewayTimeoutJob.java (87%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/{close => }/job/NormalPayTimeoutJob.java (94%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/{close/service => service/close}/GatewayTimeoutService.java (94%) rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/{close/service => service/close}/PayCloseService.java (98%) diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/GatewayPayOrderAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/GatewayPayOrderAdminController.java index f313d2e8a..9ded218e9 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/GatewayPayOrderAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/GatewayPayOrderAdminController.java @@ -1,7 +1,7 @@ package cn.daxpay.open.payment.admin.controller.trade; -import cn.daxpay.open.payment.gateway.param.GatewayPayOrderQuery; -import cn.daxpay.open.payment.gateway.result.GatewayPayOrderResult; +import cn.daxpay.open.payment.trade.order.param.GatewayPayOrderQuery; +import cn.daxpay.open.payment.trade.order.result.GatewayPayOrderResult; import cn.daxpay.open.payment.admin.service.trade.GatewayPayOrderAdminService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import cn.daxpay.open.platform.core.annotation.PermCode; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/GatewayPayOrderAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/GatewayPayOrderAdminService.java index 1258b96cc..e8b8ba1cc 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/GatewayPayOrderAdminService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/GatewayPayOrderAdminService.java @@ -2,14 +2,14 @@ package cn.daxpay.open.payment.admin.service.trade; import cn.daxpay.open.payment.common.enums.GatewayOrderStatusEnum; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; -import cn.daxpay.open.payment.gateway.convert.GatewayPayOrderConvert; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.convert.GatewayPayOrderConvert; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; -import cn.daxpay.open.payment.gateway.param.GatewayPayOrderQuery; -import cn.daxpay.open.payment.gateway.result.GatewayPayOrderResult; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.order.param.GatewayPayOrderQuery; +import cn.daxpay.open.payment.trade.order.result.GatewayPayOrderResult; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import cn.daxpay.open.payment.trade.runtime.service.sync.PaySyncService; import cn.daxpay.open.payment.trade.runtime.service.pay.PayUniHandleService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/NormalPayOrderAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/NormalPayOrderAdminService.java index 6e087c61d..f52a3f399 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/NormalPayOrderAdminService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/NormalPayOrderAdminService.java @@ -10,7 +10,7 @@ import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.order.param.NormalPayOrderQuery; import cn.daxpay.open.payment.trade.order.result.NormalPayOrderResult; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import cn.daxpay.open.payment.trade.runtime.service.sync.PaySyncService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/PayTradeAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/PayTradeAdminService.java index 54bf7da03..1a4dc0d5d 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/PayTradeAdminService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/trade/PayTradeAdminService.java @@ -10,7 +10,7 @@ import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.order.param.PayTradeQuery; import cn.daxpay.open.payment.trade.order.result.PayTradeResult; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import cn.daxpay.open.payment.trade.runtime.service.sync.PaySyncService; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPaySyncResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/convert/GatewayPayOrderConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/convert/GatewayPayOrderConvert.java similarity index 61% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/convert/GatewayPayOrderConvert.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/convert/GatewayPayOrderConvert.java index 85c874b16..61f87beb6 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/convert/GatewayPayOrderConvert.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/convert/GatewayPayOrderConvert.java @@ -1,7 +1,7 @@ -package cn.daxpay.open.payment.gateway.convert; +package cn.daxpay.open.payment.trade.order.convert; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; -import cn.daxpay.open.payment.gateway.result.GatewayPayOrderResult; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.result.GatewayPayOrderResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/dao/GatewayPayOrderManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/dao/GatewayPayOrderManager.java similarity index 93% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/dao/GatewayPayOrderManager.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/dao/GatewayPayOrderManager.java index 4ee55b130..bf9806734 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/dao/GatewayPayOrderManager.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/dao/GatewayPayOrderManager.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.gateway.dao; +package cn.daxpay.open.payment.trade.order.dao; import cn.daxpay.open.payment.common.enums.GatewayOrderStatusEnum; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; -import cn.daxpay.open.payment.gateway.param.GatewayPayOrderQuery; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.param.GatewayPayOrderQuery; import cn.daxpay.open.platform.common.mybatisplus.impl.BaseManager; import cn.daxpay.open.platform.common.mybatisplus.query.generator.QueryGenerator; import cn.daxpay.open.platform.common.mybatisplus.util.MpUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/dao/GatewayPayOrderMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/dao/GatewayPayOrderMapper.java similarity index 65% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/dao/GatewayPayOrderMapper.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/dao/GatewayPayOrderMapper.java index d99648df1..e99e085f8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/dao/GatewayPayOrderMapper.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/dao/GatewayPayOrderMapper.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.gateway.dao; +package cn.daxpay.open.payment.trade.order.dao; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/entity/GatewayPayOrder.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/GatewayPayOrder.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/entity/GatewayPayOrder.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/GatewayPayOrder.java index 6a79efab5..11fdc4fdc 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/entity/GatewayPayOrder.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/GatewayPayOrder.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.gateway.entity; +package cn.daxpay.open.payment.trade.order.entity; import cn.daxpay.open.payment.common.entity.MchBaseEntity; import cn.daxpay.open.payment.common.enums.GatewayOrderStatusEnum; @@ -20,6 +20,7 @@ import java.util.List; /// # 网关支付业务单容器 /// +/// 业务容器统一落在 trade.order（与 NormalPayOrder 同包）。 /// 聚合扫码/收银台预下单场景: 创建时不知具体通道, 仅承载收款意图。 /// 用户真正支付时再创建 pay_trade(trade_type=gateway) 并回填 channel/product/method。 @Data diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/NormalPayOrder.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/NormalPayOrder.java index 61d417a45..e02bd598a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/NormalPayOrder.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/entity/NormalPayOrder.java @@ -19,6 +19,7 @@ import java.util.List; /// # 普通支付业务单容器 /// +/// 业务容器统一落在 trade.order（与 GatewayPayOrder 等同包，纯持久化无编排 service）。 /// 普通支付场景的容器，承载商户业务单信息（bizOrderNo / 商品标题 / 回调地址 等） /// 与 pay_trade 一对一关联（trade_type = normal） /// 冗余存储金额/支付/时间线字段，便于后台查询无需 JOIN pay_trade diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/param/GatewayPayOrderQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/param/GatewayPayOrderQuery.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/param/GatewayPayOrderQuery.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/param/GatewayPayOrderQuery.java index 39b3eb082..6966ca722 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/param/GatewayPayOrderQuery.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/param/GatewayPayOrderQuery.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.gateway.param; +package cn.daxpay.open.payment.trade.order.param; import cn.daxpay.open.platform.core.annotation.QueryParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/result/GatewayPayOrderResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/result/GatewayPayOrderResult.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/result/GatewayPayOrderResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/result/GatewayPayOrderResult.java index 02db03b68..54cf3dc4a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/gateway/result/GatewayPayOrderResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/order/result/GatewayPayOrderResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.gateway.result; +package cn.daxpay.open.payment.trade.order.result; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/consumer/GatewayTimeoutConsumer.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/consumer/GatewayTimeoutConsumer.java similarity index 91% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/consumer/GatewayTimeoutConsumer.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/consumer/GatewayTimeoutConsumer.java index 8581a5fdd..d35a08db8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/consumer/GatewayTimeoutConsumer.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/consumer/GatewayTimeoutConsumer.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.trade.runtime.close.consumer; +package cn.daxpay.open.payment.trade.runtime.consumer; -import cn.daxpay.open.payment.trade.runtime.close.service.GatewayTimeoutService; +import cn.daxpay.open.payment.trade.runtime.service.close.GatewayTimeoutService; import cn.daxpay.open.payment.trade.runtime.mq.GatewayTimeoutMessage; import cn.daxpay.open.payment.trade.runtime.mq.PayArtemisConstants; import cn.daxpay.open.platform.common.json.util.JacksonUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/consumer/NormalPayTimeoutConsumer.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/consumer/NormalPayTimeoutConsumer.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/consumer/NormalPayTimeoutConsumer.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/consumer/NormalPayTimeoutConsumer.java index ee70c8898..9b83f614e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/consumer/NormalPayTimeoutConsumer.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/consumer/NormalPayTimeoutConsumer.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.trade.runtime.close.consumer; +package cn.daxpay.open.payment.trade.runtime.consumer; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import cn.daxpay.open.payment.trade.runtime.mq.NormalPayTimeoutMessage; import cn.daxpay.open.payment.trade.runtime.mq.PayArtemisConstants; import cn.daxpay.open.platform.common.json.util.JacksonUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/job/GatewayTimeoutJob.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/job/GatewayTimeoutJob.java similarity index 87% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/job/GatewayTimeoutJob.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/job/GatewayTimeoutJob.java index 9debc0952..da7c4f93e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/job/GatewayTimeoutJob.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/job/GatewayTimeoutJob.java @@ -1,11 +1,11 @@ -package cn.daxpay.open.payment.trade.runtime.close.job; +package cn.daxpay.open.payment.trade.runtime.job; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; -import cn.daxpay.open.payment.trade.runtime.close.service.GatewayTimeoutService; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.runtime.service.close.GatewayTimeoutService; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/job/NormalPayTimeoutJob.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/job/NormalPayTimeoutJob.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/job/NormalPayTimeoutJob.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/job/NormalPayTimeoutJob.java index e5a3071a3..17f4713cb 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/job/NormalPayTimeoutJob.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/job/NormalPayTimeoutJob.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.trade.runtime.close.job; +package cn.daxpay.open.payment.trade.runtime.job; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; import cn.daxpay.open.payment.trade.order.entity.PayTrade; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/ContainerFieldResolver.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/ContainerFieldResolver.java index 99ef6dc4a..6e71c363f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/ContainerFieldResolver.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/ContainerFieldResolver.java @@ -4,8 +4,8 @@ import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; import cn.daxpay.open.payment.trade.order.dao.NormalPayOrderManager; import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/callback/PayCallbackService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/callback/PayCallbackService.java index 339e8eca6..5d88ff00a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/callback/PayCallbackService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/callback/PayCallbackService.java @@ -3,10 +3,10 @@ package cn.daxpay.open.payment.trade.runtime.service.callback; import cn.daxpay.open.payment.common.callback.CallbackData; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.NormalPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.runtime.service.pay.PayUniHandleService; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/service/GatewayTimeoutService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/close/GatewayTimeoutService.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/service/GatewayTimeoutService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/close/GatewayTimeoutService.java index dc7ec2c12..a6320934a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/service/GatewayTimeoutService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/close/GatewayTimeoutService.java @@ -1,11 +1,11 @@ -package cn.daxpay.open.payment.trade.runtime.close.service; +package cn.daxpay.open.payment.trade.runtime.service.close; import cn.daxpay.open.payment.common.context.PaymentContext; import cn.daxpay.open.payment.common.enums.GatewayOrderStatusEnum; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.runtime.service.pay.PayUniHandleService; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/service/PayCloseService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/close/PayCloseService.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/service/PayCloseService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/close/PayCloseService.java index ddac14cd8..46a4468cb 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/close/service/PayCloseService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/close/PayCloseService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.trade.runtime.close.service; +package cn.daxpay.open.payment.trade.runtime.service.close; import cn.daxpay.open.payment.common.context.PaymentContext; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; @@ -6,10 +6,10 @@ import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; import cn.daxpay.open.payment.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.strategy.pay.AbsPayCloseStrategy; import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.NormalPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.record.entity.PayCloseRecord; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/PayUniHandleService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/PayUniHandleService.java index 28ebad43b..34f564821 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/PayUniHandleService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/pay/PayUniHandleService.java @@ -6,10 +6,10 @@ import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; import cn.daxpay.open.payment.trade.runtime.bo.PaySyncResultBo; import cn.daxpay.open.payment.trade.runtime.bo.PayTradeResultBo; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.NormalPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/sync/PaySyncService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/sync/PaySyncService.java index 42f87d712..01f80274c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/sync/PaySyncService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/trade/runtime/service/sync/PaySyncService.java @@ -8,10 +8,10 @@ import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.strategy.sync.AbsSyncPayOrderStrategy; import cn.daxpay.open.payment.trade.runtime.bo.PaySyncResultBo; import cn.daxpay.open.payment.trade.runtime.service.pay.PayUniHandleService; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.NormalPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.NormalPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.trade.record.entity.PaySyncRecord; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayAggregatePayService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayAggregatePayService.java index 31f8c1a73..cf0fda8ef 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayAggregatePayService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayAggregatePayService.java @@ -3,7 +3,7 @@ package cn.daxpay.open.payment.unipay.gateway.service; import cn.daxpay.open.payment.common.enums.AggregateConfigLevelEnum; import cn.daxpay.open.payment.common.enums.CashierSceneEnum; import cn.daxpay.open.payment.common.enums.GatewayPayTypeEnum; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.merchant.dao.gateway.GatewayAggregateSceneManager; import cn.daxpay.open.payment.merchant.entity.gateway.GatewayAggregateConfig; import cn.daxpay.open.payment.merchant.entity.gateway.GatewayAggregateScene; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java index bc81934eb..495db7830 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayOrderQueryService.java @@ -2,9 +2,9 @@ package cn.daxpay.open.payment.unipay.gateway.service; import cn.daxpay.open.payment.common.assist.MerchantContextLoader; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.unipay.gateway.param.GatewayOrderQueryParam; import cn.daxpay.open.payment.unipay.gateway.result.GatewayOrderResult; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java index fb1856310..51b16f56d 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayAssistService.java @@ -3,8 +3,8 @@ package cn.daxpay.open.payment.unipay.gateway.service; import cn.daxpay.open.payment.common.enums.GatewayOrderStatusEnum; import cn.daxpay.open.payment.common.enums.GatewayPayTypeEnum; import cn.daxpay.open.payment.common.assist.MerchantContextLoader; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.runtime.service.pay.PayAssistService; import cn.daxpay.open.payment.trade.runtime.mq.GatewayTimeoutMessage; import cn.daxpay.open.payment.trade.runtime.mq.PayArtemisConstants; diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java index f28589790..da1d88968 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/gateway/service/GatewayPayHandleService.java @@ -4,15 +4,15 @@ import cn.daxpay.open.payment.common.enums.GatewayOrderStatusEnum; import cn.daxpay.open.payment.common.enums.PayFundStatusEnum; import cn.daxpay.open.payment.common.enums.PayTradeTypeEnum; import cn.daxpay.open.payment.common.assist.MerchantContextLoader; -import cn.daxpay.open.payment.route.PayRouteFacade; +import cn.daxpay.open.payment.merchant.service.route.runtime.PayRouteService; import cn.daxpay.open.payment.strategy.PaymentStrategyFactory; import cn.daxpay.open.payment.strategy.pay.AbsNormalPayStrategy; import cn.daxpay.open.payment.strategy.pay.PayStrategyContext; import cn.daxpay.open.payment.trade.runtime.bo.PayTradeResultBo; import cn.daxpay.open.payment.trade.runtime.service.pay.PayUniHandleService; -import cn.daxpay.open.payment.gateway.dao.GatewayPayOrderManager; +import cn.daxpay.open.payment.trade.order.dao.GatewayPayOrderManager; import cn.daxpay.open.payment.trade.order.dao.PayTradeManager; -import cn.daxpay.open.payment.gateway.entity.GatewayPayOrder; +import cn.daxpay.open.payment.trade.order.entity.GatewayPayOrder; import cn.daxpay.open.payment.trade.order.entity.PayTrade; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult; @@ -44,7 +44,7 @@ public class GatewayPayHandleService { private final GatewayPayOrderManager gatewayPayOrderManager; private final PayTradeManager payTradeManager; - private final PayRouteFacade payRouteFacade; + private final PayRouteService payRouteService; private final MerchantContextLoader merchantContextLoader; private final PayUniHandleService payUniHandleService; private final GatewayPayAssistService gatewayPayAssistService; @@ -95,7 +95,7 @@ public class GatewayPayHandleService { // 组装路由用参数 NormalPayParam payParam = this.buildPayParam(order, product, method, channelMchNo, capability, openId, clientIp); - payRouteFacade.resolve(payParam); + payRouteService.resolve(payParam); var payStrategy = PaymentStrategyFactory.createByProduct(payParam.getProduct(), AbsNormalPayStrategy.class); var context = new PayStrategyContext().setPayParam(payParam); payStrategy.doBeforePay(context); diff --git a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/trade/controller/UniTradeController.java b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/trade/controller/UniTradeController.java index 0ec894635..fd1857e50 100644 --- a/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/trade/controller/UniTradeController.java +++ b/daxpay-payment/daxpay-payment-unipay/src/main/java/cn/daxpay/open/payment/unipay/trade/controller/UniTradeController.java @@ -8,7 +8,7 @@ import cn.daxpay.open.payment.common.result.DaxResult; import cn.daxpay.open.payment.common.util.DaxRes; import cn.daxpay.open.payment.merchant.service.permission.MerchantPermissionService; import cn.daxpay.open.payment.unipay.aop.PaymentVerify; -import cn.daxpay.open.payment.trade.runtime.close.service.PayCloseService; +import cn.daxpay.open.payment.trade.runtime.service.close.PayCloseService; import cn.daxpay.open.payment.trade.runtime.service.pay.NormalPayService; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayCloseParam; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam;