From 05a79959deaa4507560dab20b60e536012dfef7f Mon Sep 17 00:00:00 2001 From: DaxPay Date: Thu, 19 Dec 2024 19:25:32 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E5=88=86=E8=B4=A6=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 3 +-- .../allocation/AliPayAllocationService.java | 4 ++-- .../allocation/WeChatPayAllocationV2Service.java | 4 ++-- .../allocation/WeChatPayAllocationV3Service.java | 4 ++-- .../{transaction => order}/AllocFinishParam.java | 2 +- .../{transaction => order}/AllocSyncParam.java | 2 +- .../{transaction => order}/AllocationParam.java | 2 +- .../QueryAllocOrderParam.java | 2 +- .../unipay/UniAllocationController.java | 8 ++++---- .../convert/allocation/AllocOrderConvert.java | 4 ++-- .../AllocDetailManager.java | 4 ++-- .../AllocDetailMapper.java | 4 ++-- .../AllocOrderManager.java | 4 ++-- .../{transaction => order}/AllocOrderMapper.java | 4 ++-- .../{transaction => order}/AllocAndDetail.java | 2 +- .../{transaction => order}/AllocDetail.java | 2 +- .../{transaction => order}/AllocOrder.java | 2 +- .../service/allocation/AllocationService.java | 16 ++++++++-------- .../allocation/AllocationSyncService.java | 10 +++++----- .../allocation/order/AllocOrderQueryService.java | 10 +++++----- .../allocation/order/AllocOrderService.java | 14 +++++++------- .../service/notice/MerchantNoticeService.java | 4 ++-- .../callback/MerchantCallbackTaskService.java | 4 ++-- .../notice/notify/MerchantNotifyTaskService.java | 4 ++-- .../service/order/pay/PayOrderService.java | 2 +- .../service/strategy/AbsAllocationStrategy.java | 4 ++-- 26 files changed, 62 insertions(+), 63 deletions(-) rename daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/{transaction => order}/AllocFinishParam.java (89%) rename daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/{transaction => order}/AllocSyncParam.java (91%) rename daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/{transaction => order}/AllocationParam.java (97%) rename daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/{transaction => order}/QueryAllocOrderParam.java (89%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/{transaction => order}/AllocDetailManager.java (79%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/{transaction => order}/AllocDetailMapper.java (61%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/{transaction => order}/AllocOrderManager.java (92%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/{transaction => order}/AllocOrderMapper.java (61%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/{transaction => order}/AllocAndDetail.java (73%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/{transaction => order}/AllocDetail.java (96%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/{transaction => order}/AllocOrder.java (97%) diff --git a/_doc/Task.md b/_doc/Task.md index 52c2637c..43666ea0 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -14,8 +14,7 @@ - [x] 分账界面功能优化 - [x] 分账接收方配置 - [x] 分账单管理 - - [x] 接口开发 开启/完结/同步 -- [x] 分账接口开发 +- [x] 分账接口开发 开启/完结/同步 - [x] 支付宝 - [x] 微信 - [x] 分账扩展能力 diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocationService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocationService.java index 4c5255f0..d0e5d136 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocationService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocationService.java @@ -22,8 +22,8 @@ import org.dromara.daxpay.core.exception.TradeFailException; import org.dromara.daxpay.core.util.PayUtil; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV2Service.java b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV2Service.java index 58b5db7d..5d4f6c3e 100644 --- a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV2Service.java +++ b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV2Service.java @@ -25,8 +25,8 @@ import org.dromara.daxpay.core.exception.OperationFailException; import org.dromara.daxpay.core.util.PayUtil; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV3Service.java b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV3Service.java index 84f5bd7c..c713491a 100644 --- a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV3Service.java +++ b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV3Service.java @@ -22,8 +22,8 @@ import org.dromara.daxpay.core.exception.OperationFailException; import org.dromara.daxpay.core.util.PayUtil; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocFinishParam.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocFinishParam.java similarity index 89% rename from daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocFinishParam.java rename to daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocFinishParam.java index c6ce985e..85537491 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocFinishParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocFinishParam.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.core.param.allocation.transaction; +package org.dromara.daxpay.core.param.allocation.order; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocSyncParam.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocSyncParam.java similarity index 91% rename from daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocSyncParam.java rename to daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocSyncParam.java index 8b83a0fc..59ca0428 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocSyncParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocSyncParam.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.core.param.allocation.transaction; +package org.dromara.daxpay.core.param.allocation.order; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocationParam.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocationParam.java similarity index 97% rename from daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocationParam.java rename to daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocationParam.java index fab32baa..dc7efad4 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocationParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocationParam.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.core.param.allocation.transaction; +package org.dromara.daxpay.core.param.allocation.order; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/QueryAllocOrderParam.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/QueryAllocOrderParam.java similarity index 89% rename from daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/QueryAllocOrderParam.java rename to daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/QueryAllocOrderParam.java index 0934b643..73baf192 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/QueryAllocOrderParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/QueryAllocOrderParam.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.core.param.allocation.transaction; +package org.dromara.daxpay.core.param.allocation.order; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/UniAllocationController.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/UniAllocationController.java index 024692e9..0bf6434a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/UniAllocationController.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/UniAllocationController.java @@ -7,10 +7,10 @@ import lombok.RequiredArgsConstructor; import org.dromara.daxpay.core.param.allocation.receiver.AllocReceiverAddParam; import org.dromara.daxpay.core.param.allocation.receiver.AllocReceiverQueryParam; import org.dromara.daxpay.core.param.allocation.receiver.AllocReceiverRemoveParam; -import org.dromara.daxpay.core.param.allocation.transaction.AllocFinishParam; -import org.dromara.daxpay.core.param.allocation.transaction.AllocSyncParam; -import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; -import org.dromara.daxpay.core.param.allocation.transaction.QueryAllocOrderParam; +import org.dromara.daxpay.core.param.allocation.order.AllocFinishParam; +import org.dromara.daxpay.core.param.allocation.order.AllocSyncParam; +import org.dromara.daxpay.core.param.allocation.order.AllocationParam; +import org.dromara.daxpay.core.param.allocation.order.QueryAllocOrderParam; import org.dromara.daxpay.core.result.DaxResult; import org.dromara.daxpay.core.result.allocation.AllocSyncResult; import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/allocation/AllocOrderConvert.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/allocation/AllocOrderConvert.java index 0e6c33f4..fd11d12b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/allocation/AllocOrderConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/allocation/AllocOrderConvert.java @@ -2,8 +2,8 @@ package org.dromara.daxpay.service.convert.allocation; import org.dromara.daxpay.core.result.allocation.order.AllocDetailResult; import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.result.allocation.order.AllocDetailVo; import org.dromara.daxpay.service.result.allocation.order.AllocOrderVo; import org.mapstruct.Mapper; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailManager.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailManager.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailManager.java index dbe41338..a5044179 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailManager.java @@ -1,9 +1,9 @@ -package org.dromara.daxpay.service.dao.allocation.transaction; +package org.dromara.daxpay.service.dao.allocation.order; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailMapper.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailMapper.java index 881f9738..e242ef03 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailMapper.java @@ -1,8 +1,8 @@ -package org.dromara.daxpay.service.dao.allocation.transaction; +package org.dromara.daxpay.service.dao.allocation.order; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; /** * diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderManager.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderManager.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderManager.java index 94e1a308..56b34ab4 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderManager.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.dao.allocation.transaction; +package org.dromara.daxpay.service.dao.allocation.order; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.query.generator.QueryGenerator; @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.param.order.allocation.AllocOrderQuery; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderMapper.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderMapper.java index 714b5a54..1a598395 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderMapper.java @@ -1,8 +1,8 @@ -package org.dromara.daxpay.service.dao.allocation.transaction; +package org.dromara.daxpay.service.dao.allocation.order; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; /** * diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocAndDetail.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocAndDetail.java similarity index 73% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocAndDetail.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocAndDetail.java index 964ae268..987bf046 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocAndDetail.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocAndDetail.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.entity.allocation.transaction; +package org.dromara.daxpay.service.entity.allocation.order; import java.util.List; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocDetail.java similarity index 96% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocDetail.java index 01d05307..bed7fdf3 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocDetail.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.entity.allocation.transaction; +package org.dromara.daxpay.service.entity.allocation.order; import cn.bootx.platform.common.mybatisplus.function.ToResult; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocOrder.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocOrder.java similarity index 97% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocOrder.java index 97d3c46b..843e5584 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocOrder.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.entity.allocation.transaction; +package org.dromara.daxpay.service.entity.allocation.order; import cn.bootx.platform.common.mybatisplus.function.ToResult; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java index 54f0d1af..c59db697 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java @@ -12,21 +12,21 @@ import org.dromara.daxpay.core.enums.AllocationStatusEnum; import org.dromara.daxpay.core.enums.PayStatusEnum; import org.dromara.daxpay.core.exception.DataErrorException; import org.dromara.daxpay.core.exception.TradeStatusErrorException; -import org.dromara.daxpay.core.param.allocation.transaction.AllocFinishParam; -import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; -import org.dromara.daxpay.core.param.allocation.transaction.QueryAllocOrderParam; +import org.dromara.daxpay.core.param.allocation.order.AllocFinishParam; +import org.dromara.daxpay.core.param.allocation.order.AllocationParam; +import org.dromara.daxpay.core.param.allocation.order.QueryAllocOrderParam; import org.dromara.daxpay.core.result.allocation.AllocationResult; import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.code.DaxPayCode; import org.dromara.daxpay.service.convert.allocation.AllocOrderConvert; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager; import org.dromara.daxpay.service.dao.config.AllocConfigManager; import org.dromara.daxpay.service.entity.allocation.AllocConfig; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocAndDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocAndDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.order.pay.PayOrder; import org.dromara.daxpay.service.service.allocation.order.AllocOrderQueryService; import org.dromara.daxpay.service.service.allocation.order.AllocOrderService; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java index dcd26e06..96c568f1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java @@ -11,17 +11,17 @@ import org.dromara.daxpay.core.enums.AllocDetailResultEnum; import org.dromara.daxpay.core.enums.AllocationResultEnum; import org.dromara.daxpay.core.enums.AllocationStatusEnum; import org.dromara.daxpay.core.enums.TradeTypeEnum; -import org.dromara.daxpay.core.param.allocation.transaction.AllocSyncParam; +import org.dromara.daxpay.core.param.allocation.order.AllocSyncParam; import org.dromara.daxpay.core.result.allocation.AllocSyncResult; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.code.DaxPayCode; import org.dromara.daxpay.service.common.local.PaymentContextLocal; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager; import org.dromara.daxpay.service.dao.config.AllocConfigManager; import org.dromara.daxpay.service.entity.allocation.AllocConfig; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.record.sync.TradeSyncRecord; import org.dromara.daxpay.service.service.assist.PaymentAssistService; import org.dromara.daxpay.service.service.notice.MerchantNoticeService; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderQueryService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderQueryService.java index 3acdfbfe..1bb6ffe5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderQueryService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderQueryService.java @@ -11,11 +11,11 @@ import org.dromara.daxpay.core.enums.PayAllocStatusEnum; import org.dromara.daxpay.core.exception.OperationUnsupportedException; import org.dromara.daxpay.core.exception.TradeNotExistException; import org.dromara.daxpay.core.exception.TradeStatusErrorException; -import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.core.param.allocation.order.AllocationParam; +import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.order.pay.PayOrder; import org.dromara.daxpay.service.param.order.allocation.AllocOrderQuery; import org.dromara.daxpay.service.result.allocation.order.AllocDetailVo; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderService.java index e424db9c..83d75047 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderService.java @@ -12,18 +12,18 @@ import org.dromara.daxpay.core.enums.AllocationResultEnum; import org.dromara.daxpay.core.enums.AllocationStatusEnum; import org.dromara.daxpay.core.enums.PayAllocStatusEnum; import org.dromara.daxpay.core.exception.DataErrorException; -import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; -import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam.ReceiverParam; +import org.dromara.daxpay.core.param.allocation.order.AllocationParam; +import org.dromara.daxpay.core.param.allocation.order.AllocationParam.ReceiverParam; import org.dromara.daxpay.core.util.TradeNoGenerateUtil; import org.dromara.daxpay.service.dao.allocation.receiver.AllocGroupManager; import org.dromara.daxpay.service.dao.allocation.receiver.AllocReceiverManager; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; -import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager; +import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager; import org.dromara.daxpay.service.dao.order.pay.PayOrderManager; import org.dromara.daxpay.service.entity.allocation.receiver.AllocGroup; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocAndDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocAndDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.order.pay.PayOrder; import org.dromara.daxpay.service.result.allocation.receiver.AllocGroupReceiverVo; import org.dromara.daxpay.service.service.allocation.receiver.AllocGroupService; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/MerchantNoticeService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/MerchantNoticeService.java index 20ea64f6..961fe55f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/MerchantNoticeService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/MerchantNoticeService.java @@ -2,8 +2,8 @@ package org.dromara.daxpay.service.service.notice; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.order.pay.PayOrder; import org.dromara.daxpay.service.entity.order.refund.RefundOrder; import org.dromara.daxpay.service.entity.order.transfer.TransferOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackTaskService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackTaskService.java index 87f7cb2c..2c35cfe6 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackTaskService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackTaskService.java @@ -10,8 +10,8 @@ import org.dromara.daxpay.service.convert.order.pay.PayOrderConvert; import org.dromara.daxpay.service.convert.order.refund.RefundOrderConvert; import org.dromara.daxpay.service.convert.order.transfer.TransferOrderConvert; import org.dromara.daxpay.service.dao.notice.callback.MerchantCallbackTaskManager; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.notice.callback.MerchantCallbackTask; import org.dromara.daxpay.service.entity.order.pay.PayOrder; import org.dromara.daxpay.service.entity.order.refund.RefundOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java index bbe12877..8fff7f2a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java @@ -12,8 +12,8 @@ import org.dromara.daxpay.service.convert.order.pay.PayOrderConvert; import org.dromara.daxpay.service.convert.order.refund.RefundOrderConvert; import org.dromara.daxpay.service.convert.order.transfer.TransferOrderConvert; import org.dromara.daxpay.service.dao.notice.notify.MerchantNotifyTaskManager; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import org.dromara.daxpay.service.entity.notice.notify.MerchantNotifyTask; import org.dromara.daxpay.service.entity.order.pay.PayOrder; import org.dromara.daxpay.service.entity.order.refund.RefundOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java index 5d794415..0dc49489 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java @@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.daxpay.core.exception.DataErrorException; import org.dromara.daxpay.core.exception.TradeNotExistException; -import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; +import org.dromara.daxpay.core.param.allocation.order.AllocationParam; import org.dromara.daxpay.core.util.TradeNoGenerateUtil; import org.dromara.daxpay.service.dao.config.AllocConfigManager; import org.dromara.daxpay.service.dao.order.pay.PayOrderManager; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/strategy/AbsAllocationStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/strategy/AbsAllocationStrategy.java index 8a9d1a5f..700c07ad 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/strategy/AbsAllocationStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/strategy/AbsAllocationStrategy.java @@ -5,8 +5,8 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; -import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; +import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; +import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; import java.util.List;