dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-10-14 22:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

style 分账包名修改

Browse Source
This commit is contained in:
DaxPay
2024-12-19 19:25:32 +08:00
parent 8150ecf778
commit 05a79959de
26 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
_doc/Task.md
View File

@@ -14,8 +14,7 @@
- [x] 分账界面功能优化 - [x] 分账界面功能优化
- [x] 分账接收方配置 - [x] 分账接收方配置
- [x] 分账单管理 - [x] 分账单管理
- [x] 接口开发 开启/完结/同步 - [x] 分账接口开发 开启/完结/同步
- [x] 分账接口开发
- [x] 支付宝 - [x] 支付宝
- [x] 微信 - [x] 微信
- [x] 分账扩展能力 - [x] 分账扩展能力

4
daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocationService.java
View File

@@ -22,8 +22,8 @@ import org.dromara.daxpay.core.exception.TradeFailException;
import org.dromara.daxpay.core.util.PayUtil; import org.dromara.daxpay.core.util.PayUtil;
import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo;
import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;

4
daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV2Service.java
View File

@@ -25,8 +25,8 @@ import org.dromara.daxpay.core.exception.OperationFailException;
import org.dromara.daxpay.core.util.PayUtil; import org.dromara.daxpay.core.util.PayUtil;
import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo;
import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;

4
daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/allocation/WeChatPayAllocationV3Service.java
View File

@@ -22,8 +22,8 @@ import org.dromara.daxpay.core.exception.OperationFailException;
import org.dromara.daxpay.core.util.PayUtil; import org.dromara.daxpay.core.util.PayUtil;
import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo;
import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocFinishParam.java → daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocFinishParam.java
View File

@@ -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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

2
daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocSyncParam.java → daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocSyncParam.java
View File

@@ -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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;

2
daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/AllocationParam.java → daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/AllocationParam.java
View File

@@ -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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid; import jakarta.validation.Valid;

2
daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/transaction/QueryAllocOrderParam.java → daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/param/allocation/order/QueryAllocOrderParam.java
View File

@@ -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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

8
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/controller/unipay/UniAllocationController.java
View File

@@ -7,10 +7,10 @@ import lombok.RequiredArgsConstructor;
import org.dromara.daxpay.core.param.allocation.receiver.AllocReceiverAddParam; 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.AllocReceiverQueryParam;
import org.dromara.daxpay.core.param.allocation.receiver.AllocReceiverRemoveParam; 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.order.AllocFinishParam;
import org.dromara.daxpay.core.param.allocation.transaction.AllocSyncParam; import org.dromara.daxpay.core.param.allocation.order.AllocSyncParam;
import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; import org.dromara.daxpay.core.param.allocation.order.AllocationParam;
import org.dromara.daxpay.core.param.allocation.transaction.QueryAllocOrderParam; import org.dromara.daxpay.core.param.allocation.order.QueryAllocOrderParam;
import org.dromara.daxpay.core.result.DaxResult; import org.dromara.daxpay.core.result.DaxResult;
import org.dromara.daxpay.core.result.allocation.AllocSyncResult; import org.dromara.daxpay.core.result.allocation.AllocSyncResult;
import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/convert/allocation/AllocOrderConvert.java
View File

@@ -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.AllocDetailResult;
import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; 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.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; 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.AllocDetailVo;
import org.dromara.daxpay.service.result.allocation.order.AllocOrderVo; import org.dromara.daxpay.service.result.allocation.order.AllocOrderVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailManager.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailManager.java
View File

@@ -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 cn.bootx.platform.common.mybatisplus.impl.BaseManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; 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 org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocDetailMapper.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocDetailMapper.java
View File

@@ -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 com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
/** /**
* *

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderManager.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderManager.java
View File

@@ -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.impl.BaseManager;
import cn.bootx.platform.common.mybatisplus.query.generator.QueryGenerator; 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.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.daxpay.service.common.entity.MchAppBaseEntity; 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.dromara.daxpay.service.param.order.allocation.AllocOrderQuery;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/transaction/AllocOrderMapper.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/order/AllocOrderMapper.java
View File

@@ -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 com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
/** /**
* *

2
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocAndDetail.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocAndDetail.java
View File

@@ -1,4 +1,4 @@
package org.dromara.daxpay.service.entity.allocation.transaction; package org.dromara.daxpay.service.entity.allocation.order;
import java.util.List; import java.util.List;

2
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocDetail.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocDetail.java
View File

@@ -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 cn.bootx.platform.common.mybatisplus.function.ToResult;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;

2
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/transaction/AllocOrder.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/allocation/order/AllocOrder.java
View File

@@ -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 cn.bootx.platform.common.mybatisplus.function.ToResult;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;

16
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java
View File

@@ -12,21 +12,21 @@ import org.dromara.daxpay.core.enums.AllocationStatusEnum;
import org.dromara.daxpay.core.enums.PayStatusEnum; import org.dromara.daxpay.core.enums.PayStatusEnum;
import org.dromara.daxpay.core.exception.DataErrorException; import org.dromara.daxpay.core.exception.DataErrorException;
import org.dromara.daxpay.core.exception.TradeStatusErrorException; import org.dromara.daxpay.core.exception.TradeStatusErrorException;
import org.dromara.daxpay.core.param.allocation.transaction.AllocFinishParam; import org.dromara.daxpay.core.param.allocation.order.AllocFinishParam;
import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; import org.dromara.daxpay.core.param.allocation.order.AllocationParam;
import org.dromara.daxpay.core.param.allocation.transaction.QueryAllocOrderParam; import org.dromara.daxpay.core.param.allocation.order.QueryAllocOrderParam;
import org.dromara.daxpay.core.result.allocation.AllocationResult; import org.dromara.daxpay.core.result.allocation.AllocationResult;
import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult; import org.dromara.daxpay.core.result.allocation.order.AllocOrderResult;
import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo;
import org.dromara.daxpay.service.code.DaxPayCode; import org.dromara.daxpay.service.code.DaxPayCode;
import org.dromara.daxpay.service.convert.allocation.AllocOrderConvert; import org.dromara.daxpay.service.convert.allocation.AllocOrderConvert;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager;
import org.dromara.daxpay.service.dao.config.AllocConfigManager; import org.dromara.daxpay.service.dao.config.AllocConfigManager;
import org.dromara.daxpay.service.entity.allocation.AllocConfig; import org.dromara.daxpay.service.entity.allocation.AllocConfig;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocAndDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocAndDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; 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.pay.PayOrder;
import org.dromara.daxpay.service.service.allocation.order.AllocOrderQueryService; import org.dromara.daxpay.service.service.allocation.order.AllocOrderQueryService;
import org.dromara.daxpay.service.service.allocation.order.AllocOrderService; import org.dromara.daxpay.service.service.allocation.order.AllocOrderService;

10
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java
View File

@@ -11,17 +11,17 @@ import org.dromara.daxpay.core.enums.AllocDetailResultEnum;
import org.dromara.daxpay.core.enums.AllocationResultEnum; import org.dromara.daxpay.core.enums.AllocationResultEnum;
import org.dromara.daxpay.core.enums.AllocationStatusEnum; import org.dromara.daxpay.core.enums.AllocationStatusEnum;
import org.dromara.daxpay.core.enums.TradeTypeEnum; 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.core.result.allocation.AllocSyncResult;
import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo;
import org.dromara.daxpay.service.code.DaxPayCode; import org.dromara.daxpay.service.code.DaxPayCode;
import org.dromara.daxpay.service.common.local.PaymentContextLocal; import org.dromara.daxpay.service.common.local.PaymentContextLocal;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager;
import org.dromara.daxpay.service.dao.config.AllocConfigManager; import org.dromara.daxpay.service.dao.config.AllocConfigManager;
import org.dromara.daxpay.service.entity.allocation.AllocConfig; import org.dromara.daxpay.service.entity.allocation.AllocConfig;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import org.dromara.daxpay.service.entity.record.sync.TradeSyncRecord; import org.dromara.daxpay.service.entity.record.sync.TradeSyncRecord;
import org.dromara.daxpay.service.service.assist.PaymentAssistService; import org.dromara.daxpay.service.service.assist.PaymentAssistService;
import org.dromara.daxpay.service.service.notice.MerchantNoticeService; import org.dromara.daxpay.service.service.notice.MerchantNoticeService;

10
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderQueryService.java
View File

@@ -11,11 +11,11 @@ import org.dromara.daxpay.core.enums.PayAllocStatusEnum;
import org.dromara.daxpay.core.exception.OperationUnsupportedException; import org.dromara.daxpay.core.exception.OperationUnsupportedException;
import org.dromara.daxpay.core.exception.TradeNotExistException; import org.dromara.daxpay.core.exception.TradeNotExistException;
import org.dromara.daxpay.core.exception.TradeStatusErrorException; import org.dromara.daxpay.core.exception.TradeStatusErrorException;
import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; import org.dromara.daxpay.core.param.allocation.order.AllocationParam;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; 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.pay.PayOrder;
import org.dromara.daxpay.service.param.order.allocation.AllocOrderQuery; import org.dromara.daxpay.service.param.order.allocation.AllocOrderQuery;
import org.dromara.daxpay.service.result.allocation.order.AllocDetailVo; import org.dromara.daxpay.service.result.allocation.order.AllocDetailVo;

14
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/order/AllocOrderService.java
View File

@@ -12,18 +12,18 @@ import org.dromara.daxpay.core.enums.AllocationResultEnum;
import org.dromara.daxpay.core.enums.AllocationStatusEnum; import org.dromara.daxpay.core.enums.AllocationStatusEnum;
import org.dromara.daxpay.core.enums.PayAllocStatusEnum; import org.dromara.daxpay.core.enums.PayAllocStatusEnum;
import org.dromara.daxpay.core.exception.DataErrorException; import org.dromara.daxpay.core.exception.DataErrorException;
import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam; import org.dromara.daxpay.core.param.allocation.order.AllocationParam;
import org.dromara.daxpay.core.param.allocation.transaction.AllocationParam.ReceiverParam; import org.dromara.daxpay.core.param.allocation.order.AllocationParam.ReceiverParam;
import org.dromara.daxpay.core.util.TradeNoGenerateUtil; import org.dromara.daxpay.core.util.TradeNoGenerateUtil;
import org.dromara.daxpay.service.dao.allocation.receiver.AllocGroupManager; 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.receiver.AllocReceiverManager;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocDetailManager; import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager;
import org.dromara.daxpay.service.dao.allocation.transaction.AllocOrderManager; import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager;
import org.dromara.daxpay.service.dao.order.pay.PayOrderManager; 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.receiver.AllocGroup;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocAndDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocAndDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; 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.pay.PayOrder;
import org.dromara.daxpay.service.result.allocation.receiver.AllocGroupReceiverVo; import org.dromara.daxpay.service.result.allocation.receiver.AllocGroupReceiverVo;
import org.dromara.daxpay.service.service.allocation.receiver.AllocGroupService; import org.dromara.daxpay.service.service.allocation.receiver.AllocGroupService;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/MerchantNoticeService.java
View File

@@ -2,8 +2,8 @@ package org.dromara.daxpay.service.service.notice;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; 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.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; 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.pay.PayOrder;
import org.dromara.daxpay.service.entity.order.refund.RefundOrder; import org.dromara.daxpay.service.entity.order.refund.RefundOrder;
import org.dromara.daxpay.service.entity.order.transfer.TransferOrder; import org.dromara.daxpay.service.entity.order.transfer.TransferOrder;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/callback/MerchantCallbackTaskService.java
View File

@@ -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.refund.RefundOrderConvert;
import org.dromara.daxpay.service.convert.order.transfer.TransferOrderConvert; import org.dromara.daxpay.service.convert.order.transfer.TransferOrderConvert;
import org.dromara.daxpay.service.dao.notice.callback.MerchantCallbackTaskManager; 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.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import org.dromara.daxpay.service.entity.notice.callback.MerchantCallbackTask; 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.pay.PayOrder;
import org.dromara.daxpay.service.entity.order.refund.RefundOrder; import org.dromara.daxpay.service.entity.order.refund.RefundOrder;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/notice/notify/MerchantNotifyTaskService.java
View File

@@ -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.refund.RefundOrderConvert;
import org.dromara.daxpay.service.convert.order.transfer.TransferOrderConvert; import org.dromara.daxpay.service.convert.order.transfer.TransferOrderConvert;
import org.dromara.daxpay.service.dao.notice.notify.MerchantNotifyTaskManager; 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.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import org.dromara.daxpay.service.entity.notice.notify.MerchantNotifyTask; 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.pay.PayOrder;
import org.dromara.daxpay.service.entity.order.refund.RefundOrder; import org.dromara.daxpay.service.entity.order.refund.RefundOrder;

2
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java
View File

@@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.daxpay.core.exception.DataErrorException; import org.dromara.daxpay.core.exception.DataErrorException;
import org.dromara.daxpay.core.exception.TradeNotExistException; 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.core.util.TradeNoGenerateUtil;
import org.dromara.daxpay.service.dao.config.AllocConfigManager; import org.dromara.daxpay.service.dao.config.AllocConfigManager;
import org.dromara.daxpay.service.dao.order.pay.PayOrderManager; import org.dromara.daxpay.service.dao.order.pay.PayOrderManager;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/strategy/AbsAllocationStrategy.java
View File

@@ -5,8 +5,8 @@ import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo; import org.dromara.daxpay.service.bo.allocation.AllocSyncResultBo;
import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo; import org.dromara.daxpay.service.bo.allocation.AllocStartResultBo;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail;
import org.dromara.daxpay.service.entity.allocation.transaction.AllocOrder; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder;
import java.util.List; import java.util.List;