pref 支付异常类拆分

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/annotation/InitPaymentContext.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.annotation;
 
-import cn.daxpay.single.code.PaymentApiCode;
+import cn.daxpay.single.core.code.PaymentApiCode;
 
 import java.lang.annotation.*;
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/code/AliPayWay.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.code;
 
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.exception.PayFailureException;
 import lombok.experimental.UtilityClass;
 
 import java.util.Arrays;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/code/UnionPayWay.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.code;
 
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.exception.MethodNotExistException;
 import lombok.experimental.UtilityClass;
 
 import java.util.Arrays;
@@ -27,7 +27,7 @@ public class UnionPayWay {
         return PAY_WAYS.stream()
                 .filter(e -> Objects.equals(code, e.getCode()))
                 .findFirst()
-                .orElseThrow(() -> new PayFailureException("不存在的支付方式"));
+                .orElseThrow(MethodNotExistException::new);
     }
 
     /**

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/code/WalletPayWay.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.code;
 
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.exception.MethodNotExistException;
 import lombok.experimental.UtilityClass;
 
 import java.util.Collections;
@@ -26,7 +26,7 @@ public class WalletPayWay {
         return PAY_WAYS.stream()
                 .filter(e -> Objects.equals(code, e.getCode()))
                 .findFirst()
-                .orElseThrow(() -> new PayFailureException("不存在的支付方式"));
+                .orElseThrow(MethodNotExistException::new);
     }
 
     /**

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/code/WeChatPayWay.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.code;
 
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.exception.MethodNotExistException;
 import lombok.experimental.UtilityClass;
 
 import java.util.Arrays;
@@ -27,7 +27,7 @@ public class WeChatPayWay {
         return PAY_WAYS.stream()
             .filter(e -> Objects.equals(code, e.getCode()))
             .findFirst()
-            .orElseThrow(() -> new PayFailureException("不存在的支付方式"));
+            .orElseThrow(MethodNotExistException::new);
     }
 
     /**

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/common/context/CallbackLocal.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.common.context;
 
-import cn.daxpay.single.code.RefundStatusEnum;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.code.PayCallbackStatusEnum;
 import cn.daxpay.single.service.code.PaymentTypeEnum;
 import lombok.Data;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/common/context/PlatformLocal.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.common.context;
 
-import cn.daxpay.single.code.PaySignTypeEnum;
+import cn.daxpay.single.core.code.PaySignTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/common/context/RefundLocal.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.common.context;
 
-import cn.daxpay.single.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/common/context/TransferLocal.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.common.context;
 
-import cn.daxpay.single.code.TransferStatusEnum;
+import cn.daxpay.single.core.code.TransferStatusEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/configuration/DaxPayProperties.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.configuration;
 
-import cn.daxpay.single.util.OrderNoGenerateUtil;
+import cn.daxpay.single.core.util.OrderNoGenerateUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayAllocationReceiverService.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
+import cn.daxpay.single.core.exception.TradeStatusErrorException;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.payment.allocation.entity.AllocationReceiver;
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import static cn.daxpay.single.code.AllocReceiverTypeEnum.*;
+import static cn.daxpay.single.core.code.AllocReceiverTypeEnum.*;
 
 /**
  * 支付宝分账
@@ -107,7 +107,7 @@ public class AliPayAllocationReceiverService {
                 errorMsg = alipayResponse.getMsg();
             }
             log.error("分账接收方处理失败 {}", errorMsg);
-            throw new PayFailureException(errorMsg);
+            throw new TradeStatusErrorException(errorMsg);
         }
     }
 }

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayAllocationService.java

@@ -2,15 +2,15 @@ package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.function.CollectorsFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.exception.TradeFailedException;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrderDetail;
 import cn.daxpay.single.service.core.payment.sync.result.AllocRemoteSyncResult;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -155,7 +155,7 @@ public class AliPayAllocationService {
                 errorMsg = alipayResponse.getMsg();
             }
             log.error("分账处理失败 {}", errorMsg);
-            throw new PayFailureException(errorMsg);
+            throw new TradeFailedException(errorMsg);
         }
     }
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCallbackService.java

@@ -2,8 +2,8 @@ package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.util.CertUtil;
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.code.PayCallbackStatusEnum;
 import cn.daxpay.single.service.code.PayRepairSourceEnum;
 import cn.daxpay.single.service.code.PaymentTypeEnum;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCloseService.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
-import cn.daxpay.single.code.PaySyncStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PaySyncStatusEnum;
+import cn.daxpay.single.core.exception.PayFailureException;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayConfigService.java

@@ -2,7 +2,7 @@ package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.dto.LabelValue;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.exception.PayFailureException;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.code.AliPayWay;
 import cn.daxpay.single.service.core.channel.alipay.dao.AliPayConfigManager;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayReconcileService.java

@@ -1,8 +1,8 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.ReconcileTradeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.ReconcileTradeEnum;
+import cn.daxpay.single.core.exception.ReconciliationFailedException;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.code.ReconcileFileTypeEnum;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
@@ -15,7 +15,7 @@ import cn.daxpay.single.service.core.order.reconcile.dao.ReconcileFileManager;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileFile;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOrder;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOutTrade;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.csv.CsvReader;
@@ -90,7 +90,7 @@ public class AliPayReconcileService {
             // 判断返回结果
             if (!Objects.equals(AliPayCode.SUCCESS, response.getCode())) {
                 log.error("获取支付宝对账单失败: {}", response.getSubMsg());
-                throw new PayFailureException(response.getSubMsg());
+                throw new ReconciliationFailedException(response.getSubMsg());
             }
 
             // 获取对账单下载地址并下载

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayRefundService.java

@@ -1,14 +1,14 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
-import cn.daxpay.single.code.RefundStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.RefundStatusEnum;
+import cn.daxpay.single.core.exception.PayFailureException;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.common.context.ErrorInfoLocal;
 import cn.daxpay.single.service.common.context.RefundLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;
-import cn.daxpay.single.util.PayUtil;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.domain.AlipayTradeRefundModel;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayService.java

@@ -1,17 +1,18 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.channel.AliPayParam;
-import cn.daxpay.single.param.payment.pay.PayParam;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.exception.PayFailureException;
+import cn.daxpay.single.core.exception.TradeFailedException;
+import cn.daxpay.single.core.param.channel.AliPayParam;
+import cn.daxpay.single.core.param.payment.pay.PayParam;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.code.AliPayWay;
 import cn.daxpay.single.service.common.context.PayLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
-import cn.daxpay.single.util.PayUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.Method;
@@ -142,7 +143,7 @@ public class AliPayService {
         }
         catch (AlipayApiException e) {
             log.error("支付宝手机支付失败", e);
-            throw new PayFailureException("支付宝手机支付失败");
+            throw new TradeFailedException("支付宝手机支付失败");
         }
     }
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPaySyncService.java

@@ -1,10 +1,10 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PaySyncStatusEnum;
-import cn.daxpay.single.code.RefundSyncStatusEnum;
-import cn.daxpay.single.code.TransferStatusEnum;
-import cn.daxpay.single.result.sync.TransferSyncResult;
+import cn.daxpay.single.core.code.PaySyncStatusEnum;
+import cn.daxpay.single.core.code.RefundSyncStatusEnum;
+import cn.daxpay.single.core.code.TransferStatusEnum;
+import cn.daxpay.single.core.result.sync.TransferSyncResult;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayTransferService.java

@@ -1,14 +1,14 @@
 package cn.daxpay.single.service.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.TransferStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.TransferStatusEnum;
+import cn.daxpay.single.core.exception.TradeFailedException;
 import cn.daxpay.single.service.code.AliPayCode;
 import cn.daxpay.single.service.common.context.TransferLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.order.transfer.entity.TransferOrder;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.hutool.core.date.DatePattern;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.domain.AlipayFundAccountQueryModel;
@@ -87,7 +87,7 @@ public class AliPayTransferService {
         AlipayFundTransUniTransferResponse response = alipayClient.execute(request);
         if (!Objects.equals(AliPayCode.SUCCESS, response.getCode())) {
             log.error("网关返回退款失败: {}", response.getSubMsg());
-            throw new PayFailureException(response.getSubMsg());
+            throw new TradeFailedException(response.getSubMsg());
         }
         TransferLocal transferInfo = PaymentContextLocal.get().getTransferInfo();
         // 通道转账号

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayCallbackService.java

@@ -1,9 +1,9 @@
 package cn.daxpay.single.service.core.channel.union.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import cn.daxpay.single.service.code.PayCallbackStatusEnum;
 import cn.daxpay.single.service.code.PayRepairSourceEnum;
 import cn.daxpay.single.service.code.PaymentTypeEnum;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayCloseService.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.channel.union.service;
 
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.exception.UnsupportedAbilityException;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.sdk.union.api.UnionPayKit;
 import lombok.RequiredArgsConstructor;
@@ -21,7 +21,7 @@ public class UnionPayCloseService {
      * 关闭订单
      */
     public void close(PayOrder payOrder, UnionPayKit unionPayKit) {
-        throw new PayFailureException("云闪付没有关闭订单功能!");
+        throw new UnsupportedAbilityException("云闪付没有关闭订单功能!");
 //        this.verifyErrorMsg(result);
     }
 }

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayConfigService.java

@@ -2,7 +2,7 @@ package cn.daxpay.single.service.core.channel.union.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.dto.LabelValue;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.exception.ChannelNotEnabledException;
 import cn.daxpay.single.service.code.UnionPayWay;
 import cn.daxpay.single.service.core.channel.union.dao.UnionPayConfigManager;
 import cn.daxpay.single.service.core.channel.union.entity.UnionPayConfig;
@@ -72,7 +72,7 @@ public class UnionPayConfigService {
     public UnionPayConfig getAndCheckConfig() {
         UnionPayConfig unionPayConfig = this.getConfig();
         if (!unionPayConfig.getEnable()){
-            throw new PayFailureException("云闪付支付未启用");
+            throw new ChannelNotEnabledException("云闪付支付未启用");
         }
         return unionPayConfig;
     }

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayReconcileService.java

@@ -1,9 +1,8 @@
 package cn.daxpay.single.service.core.channel.union.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.ReconcileTradeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.ReconcileTradeEnum;
+import cn.daxpay.single.core.exception.ReconcileGetFailedException;
 import cn.daxpay.single.service.code.ReconcileFileTypeEnum;
 import cn.daxpay.single.service.code.UnionPayCode;
 import cn.daxpay.single.service.code.UnionReconcileFieldEnum;
@@ -11,9 +10,9 @@ import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.channel.union.dao.UnionReconcileBillDetailManager;
 import cn.daxpay.single.service.core.channel.union.entity.UnionReconcileBillDetail;
 import cn.daxpay.single.service.core.order.reconcile.dao.ReconcileFileManager;
-import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOutTrade;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileFile;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOrder;
+import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOutTrade;
 import cn.daxpay.single.service.sdk.union.api.UnionPayKit;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64;
@@ -64,7 +63,7 @@ public class UnionPayReconcileService {
         // 判断是否成功
         if (!SDKConstants.OK_RESP_CODE.equals(map.get(SDKConstants.param_respCode))) {
             log.warn("云闪付获取对账文件失败");
-            throw new PayFailureException("云闪付获取对账文件失败");
+            throw new ReconcileGetFailedException("云闪付获取对账文件失败");
         }
 
         try {

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayRefundService.java

@@ -1,13 +1,13 @@
 package cn.daxpay.single.service.core.channel.union.service;
 
-import cn.daxpay.single.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import cn.daxpay.single.service.code.UnionPayCode;
 import cn.daxpay.single.service.common.context.RefundLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;
 import cn.daxpay.single.service.sdk.union.api.UnionPayKit;
 import cn.daxpay.single.service.sdk.union.bean.UnionRefundOrder;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import com.egzosn.pay.union.bean.UnionRefundResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayService.java

@@ -1,9 +1,10 @@
 package cn.daxpay.single.service.core.channel.union.service;
 
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.channel.UnionPayParam;
-import cn.daxpay.single.param.payment.pay.PayParam;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.exception.*;
+import cn.daxpay.single.core.param.channel.UnionPayParam;
+import cn.daxpay.single.core.param.payment.pay.PayParam;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.daxpay.single.service.code.UnionPayCode;
 import cn.daxpay.single.service.code.UnionPayWay;
 import cn.daxpay.single.service.common.context.PayLocal;
@@ -12,7 +13,6 @@ import cn.daxpay.single.service.core.channel.union.entity.UnionPayConfig;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.sdk.union.api.UnionPayKit;
 import cn.daxpay.single.service.sdk.union.bean.UnionPayOrder;
-import cn.daxpay.single.util.PayUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -45,21 +45,21 @@ public class UnionPayService {
     public void validation(PayParam payParam, UnionPayConfig unionPayConfig) {
 
         if (CollUtil.isEmpty(unionPayConfig.getPayWays())){
-            throw new PayFailureException("云闪付未配置可用的支付方式");
+            throw new MethodNotEnabledException("云闪付未配置可用的支付方式");
         }
         // 发起的支付类型是否在支持的范围内
         PayMethodEnum payMethodEnum = Optional.ofNullable(UnionPayWay.findByCode(payParam.getMethod()))
-                .orElseThrow(() -> new PayFailureException("非法的云闪付支付类型"));
+                .orElseThrow(() -> new MethodNotExistException("非法的云闪付支付类型"));
         if (!unionPayConfig.getPayWays().contains(payMethodEnum.getCode())) {
-            throw new PayFailureException("该云闪付支付方式不可用");
+            throw new MethodNotEnabledException("该云闪付支付方式不可用");
         }
         // 支付金额是否超限
         if (payParam.getAmount() > unionPayConfig.getLimitAmount()) {
-            throw new PayFailureException("云闪付支付金额超限");
+            throw new AmountExceedLimitException("云闪付支付金额超限");
         }
         // 分账
         if (Objects.equals(payParam.getAllocation(),true)) {
-            throw new PayFailureException("云闪付不支持分账");
+            throw new UnsupportedAbilityException("云闪付不支持分账");
         }
     }
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPaySyncService.java

@@ -1,8 +1,8 @@
 package cn.daxpay.single.service.core.channel.union.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PaySyncStatusEnum;
-import cn.daxpay.single.code.RefundSyncStatusEnum;
+import cn.daxpay.single.core.code.PaySyncStatusEnum;
+import cn.daxpay.single.core.code.RefundSyncStatusEnum;
 import cn.daxpay.single.service.code.UnionPayCode;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wallet/service/WalletQueryService.java

@@ -4,8 +4,8 @@ import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.exception.waller.WalletNotExistsException;
-import cn.daxpay.single.param.channel.WalletPayParam;
+import cn.daxpay.single.core.exception.PayFailureException;
+import cn.daxpay.single.core.param.channel.WalletPayParam;
 import cn.daxpay.single.service.core.channel.wallet.dao.WalletManager;
 import cn.daxpay.single.service.core.channel.wallet.entity.Wallet;
 import cn.daxpay.single.service.dto.channel.wallet.WalletDto;
@@ -65,10 +65,10 @@ public class WalletQueryService {
 
         Wallet wallet = null;
         if (Objects.nonNull(param.getWalletId())){
-            wallet =  walletManager.findById(param.getWalletId()).orElseThrow(WalletNotExistsException::new);
+            wallet =  walletManager.findById(param.getWalletId()).orElseThrow(PayFailureException::new);
         }
         if (Objects.isNull(wallet)){
-            wallet = walletManager.findByUser(param.getUserId()).orElseThrow(WalletNotExistsException::new);
+            wallet = walletManager.findByUser(param.getUserId()).orElseThrow(PayFailureException::new);
         }
         return wallet;
     }

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayAllocationReceiverService.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
+import cn.daxpay.single.core.exception.OperationFailedException;
 import cn.daxpay.single.service.code.WeChatPayCode;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.payment.allocation.entity.AllocationReceiver;
@@ -20,8 +20,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static cn.daxpay.single.code.AllocReceiverTypeEnum.WX_MERCHANT;
-import static cn.daxpay.single.code.AllocReceiverTypeEnum.WX_PERSONAL;
+import static cn.daxpay.single.core.code.AllocReceiverTypeEnum.WX_MERCHANT;
+import static cn.daxpay.single.core.code.AllocReceiverTypeEnum.WX_PERSONAL;
 
 /**
  *
@@ -109,7 +109,7 @@ public class WeChatPayAllocationReceiverService {
                 errorMsg = result.get(WeChatPayCode.RETURN_MSG);
             }
             log.error("分账绑定或解绑失败 {}", errorMsg);
-            throw new PayFailureException(errorMsg);
+            throw new OperationFailedException("分账绑定或解绑失败");
         }
     }
 }

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayAllocationService.java

@@ -2,9 +2,8 @@ package cn.daxpay.single.service.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.function.CollectorsFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
 import cn.daxpay.single.service.code.WeChatPayCode;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayCallbackService.java

@@ -1,9 +1,9 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import cn.daxpay.single.service.code.PayCallbackStatusEnum;
 import cn.daxpay.single.service.code.PayRepairSourceEnum;
 import cn.daxpay.single.service.code.PaymentTypeEnum;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayCloseService.java

@@ -1,6 +1,5 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
-import cn.daxpay.single.exception.pay.PayFailureException;
 import cn.daxpay.single.service.code.WeChatPayCode;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayConfigService.java

@@ -2,7 +2,6 @@ package cn.daxpay.single.service.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.dto.LabelValue;
-import cn.daxpay.single.exception.pay.PayFailureException;
 import cn.daxpay.single.service.code.WeChatPayWay;
 import cn.daxpay.single.service.core.channel.wechat.dao.WeChatPayConfigManager;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayReconcileService.java

@@ -1,8 +1,7 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.ReconcileTradeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.ReconcileTradeEnum;
 import cn.daxpay.single.service.code.ReconcileFileTypeEnum;
 import cn.daxpay.single.service.code.WeChatPayCode;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
@@ -16,7 +15,7 @@ import cn.daxpay.single.service.core.order.reconcile.dao.ReconcileFileManager;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOutTrade;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileFile;
 import cn.daxpay.single.service.core.order.reconcile.entity.ReconcileOrder;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.io.IoUtil;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayRefundService.java

@@ -1,7 +1,6 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
-import cn.daxpay.single.code.RefundStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import cn.daxpay.single.service.common.context.ErrorInfoLocal;
 import cn.daxpay.single.service.common.context.RefundLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayService.java

@@ -4,10 +4,9 @@ import cn.bootx.platform.common.core.util.CollUtil;
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
 import cn.bootx.platform.common.jackson.util.JacksonUtil;
 import cn.bootx.platform.common.spring.exception.RetryableException;
-import cn.daxpay.single.code.PayMethodEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.pay.PayParam;
-import cn.daxpay.single.result.sync.PaySyncResult;
+import cn.daxpay.single.core.code.PayMethodEnum;
+import cn.daxpay.single.core.param.payment.pay.PayParam;
+import cn.daxpay.single.core.result.sync.PaySyncResult;
 import cn.daxpay.single.service.code.WeChatPayCode;
 import cn.daxpay.single.service.code.WeChatPayWay;
 import cn.daxpay.single.service.common.context.PayLocal;
@@ -17,7 +16,7 @@ import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.payment.sync.service.PaySyncService;
 import cn.daxpay.single.service.param.channel.wechat.WeChatPayParam;
 import cn.daxpay.single.service.sdk.wechat.BarPayModel;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.util.StrUtil;
@@ -39,7 +38,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
-import static cn.daxpay.single.code.PaySyncStatusEnum.PROGRESS;
+import static cn.daxpay.single.core.code.PaySyncStatusEnum.PROGRESS;
 import static com.ijpay.wxpay.model.UnifiedOrderModel.UnifiedOrderModelBuilder;
 import static com.ijpay.wxpay.model.UnifiedOrderModel.builder;
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPaySyncService.java

@@ -1,8 +1,8 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PaySyncStatusEnum;
-import cn.daxpay.single.code.RefundSyncStatusEnum;
+import cn.daxpay.single.core.code.PaySyncStatusEnum;
+import cn.daxpay.single.core.code.RefundSyncStatusEnum;
 import cn.daxpay.single.service.code.WeChatPayCode;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayTransferService.java

@@ -1,6 +1,5 @@
 package cn.daxpay.single.service.core.channel.wechat.service;
 
-import cn.daxpay.single.exception.pay.PayFailureException;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.order.transfer.entity.TransferOrder;
 import lombok.RequiredArgsConstructor;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/extra/WeChatAuthService.java

@@ -1,10 +1,10 @@
 package cn.daxpay.single.service.core.extra;
 
 import cn.bootx.platform.common.redis.RedisClient;
-import cn.daxpay.single.param.assist.WxAccessTokenParam;
-import cn.daxpay.single.param.assist.WxAuthUrlParam;
-import cn.daxpay.single.result.assist.WxAccessTokenResult;
-import cn.daxpay.single.result.assist.WxAuthUrlResult;
+import cn.daxpay.single.core.param.assist.WxAccessTokenParam;
+import cn.daxpay.single.core.param.assist.WxAuthUrlParam;
+import cn.daxpay.single.core.result.assist.WxAccessTokenResult;
+import cn.daxpay.single.core.result.assist.WxAuthUrlResult;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayConfigService;
 import cn.daxpay.single.service.core.system.config.entity.PlatformConfig;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/notice/entity/ClientNoticeTask.java

@@ -7,9 +7,9 @@ import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
 import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.code.RefundStatusEnum;
-import cn.daxpay.single.result.order.AllocOrderResult;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
+import cn.daxpay.single.core.result.order.AllocOrderResult;
 import cn.daxpay.single.service.code.ClientNoticeTypeEnum;
 import cn.daxpay.single.service.core.notice.convert.ClientNoticeConvert;
 import cn.daxpay.single.service.core.payment.notice.result.PayNoticeResult;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/allocation/convert/AllocOrderConvert.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.order.allocation.convert;
 
-import cn.daxpay.single.result.order.AllocOrderDetailResult;
-import cn.daxpay.single.result.order.AllocOrderResult;
+import cn.daxpay.single.core.result.order.AllocOrderDetailResult;
+import cn.daxpay.single.core.result.order.AllocOrderResult;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrderDetail;
 import cn.daxpay.single.service.core.payment.notice.result.AllocDetailNoticeResult;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/allocation/dao/AllocationOrderManager.java

@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.common.query.generator.QueryGenerator;
-import cn.daxpay.single.code.AllocOrderStatusEnum;
+import cn.daxpay.single.core.code.AllocOrderStatusEnum;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;
 import cn.daxpay.single.service.param.order.AllocOrderQuery;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/allocation/entity/AllocOrder.java

@@ -5,9 +5,9 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
-import cn.daxpay.single.code.AllocOrderResultEnum;
-import cn.daxpay.single.code.AllocOrderStatusEnum;
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.AllocOrderResultEnum;
+import cn.daxpay.single.core.code.AllocOrderStatusEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.order.allocation.convert.AllocOrderConvert;
 import cn.daxpay.single.service.dto.order.allocation.AllocOrderDto;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/allocation/entity/AllocOrderDetail.java

@@ -5,8 +5,8 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
 import cn.daxpay.single.service.common.typehandler.DecryptTypeHandler;
 import cn.daxpay.single.service.core.order.allocation.convert.AllocOrderConvert;
 import cn.daxpay.single.service.dto.order.allocation.AllocationOrderDetailDto;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/allocation/service/AllocOrderQueryService.java

@@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.rest.dto.LabelValue;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.core.util.ResultConvertUtil;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocOrderDetailManager;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocationOrderManager;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/allocation/service/AllocOrderService.java

@@ -1,12 +1,11 @@
 package cn.daxpay.single.service.core.order.allocation.service;
 
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.code.AllocOrderResultEnum;
-import cn.daxpay.single.code.AllocOrderStatusEnum;
-import cn.daxpay.single.code.PayOrderAllocStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.allocation.AllocReceiverParam;
-import cn.daxpay.single.param.payment.allocation.AllocationParam;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.code.AllocOrderResultEnum;
+import cn.daxpay.single.core.code.AllocOrderStatusEnum;
+import cn.daxpay.single.core.code.PayOrderAllocStatusEnum;
+import cn.daxpay.single.core.param.payment.allocation.AllocReceiverParam;
+import cn.daxpay.single.core.param.payment.allocation.AllocationParam;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocOrderDetailManager;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocationOrderManager;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;
@@ -17,7 +16,7 @@ import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.payment.allocation.dao.AllocationReceiverManager;
 import cn.daxpay.single.service.core.payment.allocation.entity.AllocationReceiver;
 import cn.daxpay.single.service.dto.allocation.AllocationGroupReceiverResult;
-import cn.daxpay.single.util.OrderNoGenerateUtil;
+import cn.daxpay.single.core.util.OrderNoGenerateUtil;
 import cn.hutool.core.util.IdUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/pay/convert/PayOrderConvert.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.order.pay.convert;
 
-import cn.daxpay.single.result.order.PayOrderResult;
+import cn.daxpay.single.core.result.order.PayOrderResult;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.payment.notice.result.PayNoticeResult;
 import cn.daxpay.single.service.dto.order.pay.PayOrderDto;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/pay/dao/PayOrderManager.java

@@ -4,8 +4,8 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.common.query.generator.QueryGenerator;
-import cn.daxpay.single.code.PayOrderAllocStatusEnum;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.PayOrderAllocStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.param.order.PayOrderQuery;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/pay/entity/PayOrder.java

@@ -6,9 +6,10 @@ import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
 import cn.daxpay.single.code.*;
-import cn.daxpay.single.param.channel.AliPayParam;
-import cn.daxpay.single.param.channel.WalletPayParam;
-import cn.daxpay.single.param.channel.WeChatPayParam;
+import cn.daxpay.single.core.code.*;
+import cn.daxpay.single.core.param.channel.AliPayParam;
+import cn.daxpay.single.core.param.channel.WalletPayParam;
+import cn.daxpay.single.core.param.channel.WeChatPayParam;
 import cn.daxpay.single.service.core.order.pay.convert.PayOrderConvert;
 import cn.daxpay.single.service.dto.order.pay.PayOrderDto;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/pay/service/PayOrderQueryService.java

@@ -3,9 +3,10 @@ package cn.daxpay.single.service.core.order.pay.service;
 import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.pay.QueryPayParam;
-import cn.daxpay.single.result.order.PayOrderResult;
+import cn.daxpay.single.core.exception.ParamValidationFailedException;
+import cn.daxpay.single.core.exception.TradeNotExistException;
+import cn.daxpay.single.core.param.payment.pay.QueryPayParam;
+import cn.daxpay.single.core.result.order.PayOrderResult;
 import cn.daxpay.single.service.core.order.pay.convert.PayOrderConvert;
 import cn.daxpay.single.service.core.order.pay.dao.PayOrderManager;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
@@ -79,11 +80,11 @@ public class PayOrderQueryService {
     public PayOrderResult queryPayOrder(QueryPayParam param) {
         // 校验参数
         if (StrUtil.isBlank(param.getBizOrderNoeNo()) && Objects.isNull(param.getOrderNo())){
-            throw new PayFailureException("业务号或支付单ID不能都为空");
+            throw new ParamValidationFailedException("业务号或支付单ID不能都为空");
         }
         // 查询支付单
         PayOrder payOrder = this.findByBizOrOrderNo(param.getOrderNo(), param.getBizOrderNoeNo())
-                .orElseThrow(() -> new PayFailureException("支付订单不存在"));
+                .orElseThrow(() -> new TradeNotExistException("支付订单不存在"));
         return PayOrderConvert.CONVERT.convertResult(payOrder);
     }
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/pay/service/PayOrderService.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.order.pay.service;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.core.order.pay.dao.PayOrderManager;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.payment.pay.service.PayExpiredTimeService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/reconcile/entity/ReconcileDiff.java

@@ -2,8 +2,8 @@ package cn.daxpay.single.service.core.order.reconcile.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.ReconcileTradeEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.ReconcileTradeEnum;
 import cn.daxpay.single.service.code.ReconcileDiffTypeEnum;
 import cn.daxpay.single.service.common.typehandler.ReconcileDiffTypeHandler;
 import cn.daxpay.single.service.core.order.reconcile.conver.ReconcileConvert;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/reconcile/entity/ReconcileOrder.java

@@ -5,7 +5,7 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.code.ReconcileResultEnum;
 import cn.daxpay.single.service.core.order.reconcile.conver.ReconcileConvert;
 import cn.daxpay.single.service.dto.order.reconcile.ReconcileOrderDto;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/convert/RefundOrderConvert.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.order.refund.convert;
 
-import cn.daxpay.single.result.order.RefundOrderResult;
+import cn.daxpay.single.core.result.order.RefundOrderResult;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;
 import cn.daxpay.single.service.core.payment.notice.result.RefundNoticeResult;
 import cn.daxpay.single.service.dto.order.refund.RefundOrderDto;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/dao/RefundOrderManager.java

@@ -4,8 +4,8 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.common.query.generator.QueryGenerator;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;
 import cn.daxpay.single.service.param.order.RefundOrderQuery;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/entity/RefundOrder.java

@@ -5,11 +5,11 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.RefundStatusEnum;
-import cn.daxpay.single.param.channel.AliPayParam;
-import cn.daxpay.single.param.channel.WalletPayParam;
-import cn.daxpay.single.param.channel.WeChatPayParam;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
+import cn.daxpay.single.core.param.channel.AliPayParam;
+import cn.daxpay.single.core.param.channel.WalletPayParam;
+import cn.daxpay.single.core.param.channel.WeChatPayParam;
 import cn.daxpay.single.service.core.order.refund.convert.RefundOrderConvert;
 import cn.daxpay.single.service.dto.order.refund.RefundOrderDto;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/service/RefundOrderQueryService.java

@@ -4,9 +4,8 @@ import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.refund.QueryRefundParam;
-import cn.daxpay.single.result.order.RefundOrderResult;
+import cn.daxpay.single.core.param.payment.refund.QueryRefundParam;
+import cn.daxpay.single.core.result.order.RefundOrderResult;
 import cn.daxpay.single.service.core.order.refund.convert.RefundOrderConvert;
 import cn.daxpay.single.service.core.order.refund.dao.RefundOrderManager;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/service/RefundOrderService.java

@@ -2,13 +2,13 @@ package cn.daxpay.single.service.core.order.refund.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.spring.util.WebServletUtil;
-import cn.daxpay.single.param.payment.refund.RefundParam;
+import cn.daxpay.single.core.param.payment.refund.RefundParam;
 import cn.daxpay.single.service.core.order.refund.dao.RefundOrderManager;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;
 import cn.daxpay.single.service.core.payment.common.service.PaymentAssistService;
 import cn.daxpay.single.service.core.payment.refund.service.RefundService;
 import cn.daxpay.single.service.param.order.PayOrderRefundParam;
-import cn.daxpay.single.util.OrderNoGenerateUtil;
+import cn.daxpay.single.core.util.OrderNoGenerateUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/transfer/convert/TransferOrderConvert.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.order.transfer.convert;
 
-import cn.daxpay.single.result.order.TransferOrderResult;
+import cn.daxpay.single.core.result.order.TransferOrderResult;
 import cn.daxpay.single.service.core.order.transfer.entity.TransferOrder;
 import cn.daxpay.single.service.dto.order.transfer.TransferOrderDto;
 import org.mapstruct.Mapper;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/transfer/dao/TransferOrderManager.java

@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.common.query.generator.QueryGenerator;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.core.order.refund.entity.RefundOrder;
 import cn.daxpay.single.service.core.order.transfer.entity.TransferOrder;
 import cn.daxpay.single.service.param.order.TransferOrderQuery;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/transfer/entity/TransferOrder.java

@@ -5,9 +5,10 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.TransferPayeeTypeEnum;
-import cn.daxpay.single.code.TransferTypeEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.TransferPayeeTypeEnum;
+import cn.daxpay.single.core.code.TransferStatusEnum;
+import cn.daxpay.single.core.code.TransferTypeEnum;
 import cn.daxpay.single.service.core.order.transfer.convert.TransferOrderConvert;
 import cn.daxpay.single.service.dto.order.transfer.TransferOrderDto;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
@@ -93,7 +94,7 @@ public class TransferOrder extends MpBaseEntity implements EntityBaseFunction<Tr
 
     /**
      * 状态
-     * @see cn.daxpay.single.code.TransferStatusEnum
+     * @see TransferStatusEnum
      */
     @DbColumn(comment = "状态", length = 20, isNull = false)
     private String status;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/transfer/service/TransferOrderQueryService.java

@@ -4,9 +4,8 @@ import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.transfer.QueryTransferParam;
-import cn.daxpay.single.result.order.TransferOrderResult;
+import cn.daxpay.single.core.param.payment.transfer.QueryTransferParam;
+import cn.daxpay.single.core.result.order.TransferOrderResult;
 import cn.daxpay.single.service.core.order.transfer.convert.TransferOrderConvert;
 import cn.daxpay.single.service.core.order.transfer.dao.TransferOrderManager;
 import cn.daxpay.single.service.core.order.transfer.entity.TransferOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/convert/AllocationReceiverConvert.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.payment.allocation.convert;
 
-import cn.daxpay.single.param.payment.allocation.AllocReceiverAddParam;
-import cn.daxpay.single.result.allocation.AllocReceiverResult;
+import cn.daxpay.single.core.param.payment.allocation.AllocReceiverAddParam;
+import cn.daxpay.single.core.result.allocation.AllocReceiverResult;
 import cn.daxpay.single.service.core.payment.allocation.entity.AllocationReceiver;
 import cn.daxpay.single.service.dto.allocation.AllocationReceiverDto;
 import org.mapstruct.Mapper;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/entity/AllocationReceiver.java

@@ -2,9 +2,9 @@ package cn.daxpay.single.service.core.payment.allocation.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
-import cn.daxpay.single.code.AllocRelationTypeEnum;
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
+import cn.daxpay.single.core.code.AllocRelationTypeEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.common.typehandler.DecryptTypeHandler;
 import cn.daxpay.single.service.core.payment.allocation.convert.AllocationReceiverConvert;
 import cn.daxpay.single.service.dto.allocation.AllocationReceiverDto;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationAssistService.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.allocation.service;
 
-import cn.daxpay.single.param.payment.allocation.AllocationParam;
+import cn.daxpay.single.core.param.payment.allocation.AllocationParam;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocationOrderManager;
 import cn.daxpay.single.service.core.order.allocation.entity.AllocOrder;
 import lombok.RequiredArgsConstructor;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationGroupService.java

@@ -6,7 +6,6 @@ import cn.bootx.platform.common.core.function.CollectorsFunction;
 import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.code.PayChannelEnum;
 import cn.daxpay.single.service.core.payment.allocation.convert.AllocationGroupConvert;
 import cn.daxpay.single.service.core.payment.allocation.dao.AllocationGroupManager;
 import cn.daxpay.single.service.core.payment.allocation.dao.AllocationGroupReceiverManager;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationReceiverService.java

@@ -6,16 +6,15 @@ import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.dto.LabelValue;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.allocation.AllocReceiverAddParam;
-import cn.daxpay.single.param.payment.allocation.AllocReceiverRemoveParam;
-import cn.daxpay.single.param.payment.allocation.QueryAllocReceiverParam;
-import cn.daxpay.single.result.allocation.AllocReceiverAddResult;
-import cn.daxpay.single.result.allocation.AllocReceiverRemoveResult;
-import cn.daxpay.single.result.allocation.AllocReceiverResult;
-import cn.daxpay.single.result.allocation.AllocReceiversResult;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.param.payment.allocation.AllocReceiverAddParam;
+import cn.daxpay.single.core.param.payment.allocation.AllocReceiverRemoveParam;
+import cn.daxpay.single.core.param.payment.allocation.QueryAllocReceiverParam;
+import cn.daxpay.single.core.result.allocation.AllocReceiverAddResult;
+import cn.daxpay.single.core.result.allocation.AllocReceiverRemoveResult;
+import cn.daxpay.single.core.result.allocation.AllocReceiverResult;
+import cn.daxpay.single.core.result.allocation.AllocReceiversResult;
 import cn.daxpay.single.service.core.payment.allocation.convert.AllocationReceiverConvert;
 import cn.daxpay.single.service.core.payment.allocation.dao.AllocationGroupReceiverManager;
 import cn.daxpay.single.service.core.payment.allocation.dao.AllocationReceiverManager;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationService.java

@@ -3,17 +3,16 @@ package cn.daxpay.single.service.core.payment.allocation.service;
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.exception.RepetitiveOperationException;
 import cn.bootx.platform.common.core.util.CollUtil;
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.code.AllocOrderResultEnum;
-import cn.daxpay.single.code.AllocOrderStatusEnum;
-import cn.daxpay.single.code.PayOrderAllocStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.allocation.AllocFinishParam;
-import cn.daxpay.single.param.payment.allocation.AllocationParam;
-import cn.daxpay.single.param.payment.allocation.QueryAllocOrderParam;
-import cn.daxpay.single.result.allocation.AllocationResult;
-import cn.daxpay.single.result.order.AllocOrderDetailResult;
-import cn.daxpay.single.result.order.AllocOrderResult;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.code.AllocOrderResultEnum;
+import cn.daxpay.single.core.code.AllocOrderStatusEnum;
+import cn.daxpay.single.core.code.PayOrderAllocStatusEnum;
+import cn.daxpay.single.core.param.payment.allocation.AllocFinishParam;
+import cn.daxpay.single.core.param.payment.allocation.AllocationParam;
+import cn.daxpay.single.core.param.payment.allocation.QueryAllocOrderParam;
+import cn.daxpay.single.core.result.allocation.AllocationResult;
+import cn.daxpay.single.core.result.order.AllocOrderDetailResult;
+import cn.daxpay.single.core.result.order.AllocOrderResult;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.order.allocation.convert.AllocOrderConvert;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocOrderDetailManager;
@@ -41,8 +40,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static cn.daxpay.single.code.AllocOrderStatusEnum.ALLOCATION_END;
-import static cn.daxpay.single.code.AllocOrderStatusEnum.FINISH_FAILED;
+import static cn.daxpay.single.core.code.AllocOrderStatusEnum.ALLOCATION_END;
+import static cn.daxpay.single.core.code.AllocOrderStatusEnum.FINISH_FAILED;
 
 /**
  * 分账服务

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/service/AllocationSyncService.java

@@ -2,11 +2,11 @@ package cn.daxpay.single.service.core.payment.allocation.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.exception.RepetitiveOperationException;
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.code.AllocOrderResultEnum;
-import cn.daxpay.single.code.AllocOrderStatusEnum;
-import cn.daxpay.single.param.payment.allocation.AllocSyncParam;
-import cn.daxpay.single.result.sync.AllocSyncResult;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.code.AllocOrderResultEnum;
+import cn.daxpay.single.core.code.AllocOrderStatusEnum;
+import cn.daxpay.single.core.param.payment.allocation.AllocSyncParam;
+import cn.daxpay.single.core.result.sync.AllocSyncResult;
 import cn.daxpay.single.service.code.PaymentTypeEnum;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.order.allocation.dao.AllocOrderDetailManager;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/strategy/allocation/AliPayAllocationStrategy.java

@@ -1,7 +1,6 @@
 package cn.daxpay.single.service.core.payment.allocation.strategy.allocation;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayAllocationService;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/strategy/allocation/WeChatPayAllocationStrategy.java

@@ -1,7 +1,6 @@
 package cn.daxpay.single.service.core.payment.allocation.strategy.allocation;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayAllocationService;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/strategy/receiver/AliPayAllocationReceiverStrategy.java

@@ -1,7 +1,6 @@
 package cn.daxpay.single.service.core.payment.allocation.strategy.receiver;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayAllocationReceiverService;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/allocation/strategy/receiver/WeChatPayAllocationReceiverStrategy.java

@@ -1,7 +1,6 @@
 package cn.daxpay.single.service.core.payment.allocation.strategy.receiver;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayAllocationReceiverService;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/callback/service/PayCallbackService.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.payment.callback.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.code.PayCallbackStatusEnum;
 import cn.daxpay.single.service.code.PayRepairWayEnum;
 import cn.daxpay.single.service.common.context.CallbackLocal;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/callback/service/RefundCallbackService.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.callback.service;
 
-import cn.daxpay.single.code.RefundStatusEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
 import cn.daxpay.single.service.code.PayCallbackStatusEnum;
 import cn.daxpay.single.service.code.RefundRepairWayEnum;
 import cn.daxpay.single.service.common.context.CallbackLocal;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/cancel/service/PayCancelService.java

@@ -1,10 +1,9 @@
 package cn.daxpay.single.service.core.payment.cancel.service;
 
 import cn.bootx.platform.common.core.exception.RepetitiveOperationException;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.pay.PayCancelParam;
-import cn.daxpay.single.result.pay.PayCancelResult;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.param.payment.pay.PayCancelParam;
+import cn.daxpay.single.core.result.pay.PayCancelResult;
 import cn.daxpay.single.service.code.PayCloseTypeEnum;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/cancel/strategy/AliPayCancelStrategy.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.cancel.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayCloseService;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/cancel/strategy/WeChatPayCancelStrategy.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.payment.cancel.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayMethodEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayMethodEnum;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayCloseService;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/close/service/PayCloseService.java

@@ -1,10 +1,9 @@
 package cn.daxpay.single.service.core.payment.close.service;
 
 import cn.bootx.platform.common.core.exception.RepetitiveOperationException;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.pay.PayCloseParam;
-import cn.daxpay.single.result.pay.PayCloseResult;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.param.payment.pay.PayCloseParam;
+import cn.daxpay.single.core.result.pay.PayCloseResult;
 import cn.daxpay.single.service.code.PayCloseTypeEnum;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/close/strategy/AliPayCloseStrategy.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.close.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayCloseService;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/close/strategy/UnionPayCloseStrategy.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.close.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.union.entity.UnionPayConfig;
 import cn.daxpay.single.service.core.channel.union.service.UnionPayCloseService;
 import cn.daxpay.single.service.core.channel.union.service.UnionPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/close/strategy/WeChatPayCloseStrategy.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.close.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayCloseService;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/common/aop/InitPlatformInfoAop.java

@@ -1,7 +1,6 @@
 package cn.daxpay.single.service.core.payment.common.aop;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
-import cn.daxpay.single.exception.pay.PayFailureException;
 import cn.daxpay.single.service.annotation.InitPaymentContext;
 import cn.daxpay.single.service.core.system.config.dao.PayApiConfigManager;
 import cn.daxpay.single.service.core.system.config.entity.PayApiConfig;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/common/aop/PaymentVerifyAop.java

@@ -2,12 +2,11 @@ package cn.daxpay.single.service.core.payment.common.aop;
 
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.util.ValidationUtil;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.PaymentCommonParam;
-import cn.daxpay.single.result.PaymentCommonResult;
+import cn.daxpay.single.core.param.PaymentCommonParam;
+import cn.daxpay.single.core.result.PaymentCommonResult;
 import cn.daxpay.single.service.annotation.PaymentVerify;
 import cn.daxpay.single.service.core.payment.common.service.PaymentAssistService;
-import cn.daxpay.single.util.DaxRes;
+import cn.daxpay.single.core.util.DaxRes;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/common/service/PaymentAssistService.java

@@ -1,15 +1,16 @@
 package cn.daxpay.single.service.core.payment.common.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PaySignTypeEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.PaymentCommonParam;
-import cn.daxpay.single.result.PaymentCommonResult;
+import cn.daxpay.single.core.code.PaySignTypeEnum;
+import cn.daxpay.single.core.exception.PayFailureException;
+import cn.daxpay.single.core.exception.VerifySignFailedException;
+import cn.daxpay.single.core.param.PaymentCommonParam;
+import cn.daxpay.single.core.result.PaymentCommonResult;
+import cn.daxpay.single.core.util.PaySignUtil;
 import cn.daxpay.single.service.common.context.ClientLocal;
 import cn.daxpay.single.service.common.context.PlatformLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.system.config.service.PlatformConfigService;
-import cn.daxpay.single.util.PaySignUtil;
 import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -56,15 +57,15 @@ public class PaymentAssistService {
         if (Objects.equals(PaySignTypeEnum.HMAC_SHA256.getCode(), signType)){
             boolean verified = PaySignUtil.verifyHmacSha256Sign(param, platform.getSignSecret(), param.getSign());
             if (!verified){
-                throw new PayFailureException("未通过签名验证");
+                throw new VerifySignFailedException();
             }
         } else if (Objects.equals(PaySignTypeEnum.MD5.getCode(), signType)){
             boolean verified = PaySignUtil.verifyMd5Sign(param, platform.getSignSecret(), param.getSign());
             if (!verified){
-                throw new PayFailureException("未通过签名验证");
+                throw new VerifySignFailedException();
             }
         } else {
-            throw new PayFailureException("签名方式错误");
+            throw new VerifySignFailedException();
         }
     }
 

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/notice/result/AllocDetailNoticeResult.java

@@ -1,8 +1,8 @@
 package cn.daxpay.single.service.core.payment.notice.result;
 
-import cn.daxpay.single.code.AllocDetailResultEnum;
-import cn.daxpay.single.code.AllocReceiverTypeEnum;
-import cn.daxpay.single.serializer.LocalDateTimeToTimestampSerializer;
+import cn.daxpay.single.core.code.AllocDetailResultEnum;
+import cn.daxpay.single.core.code.AllocReceiverTypeEnum;
+import cn.daxpay.single.core.serializer.LocalDateTimeToTimestampSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/notice/result/AllocNoticeResult.java

@@ -1,10 +1,10 @@
 package cn.daxpay.single.service.core.payment.notice.result;
 
-import cn.daxpay.single.code.AllocOrderResultEnum;
-import cn.daxpay.single.code.AllocOrderStatusEnum;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.result.PaymentCommonResult;
-import cn.daxpay.single.serializer.LocalDateTimeToTimestampSerializer;
+import cn.daxpay.single.core.code.AllocOrderResultEnum;
+import cn.daxpay.single.core.code.AllocOrderStatusEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.result.PaymentCommonResult;
+import cn.daxpay.single.core.serializer.LocalDateTimeToTimestampSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/notice/result/PayNoticeResult.java

@@ -1,11 +1,11 @@
 package cn.daxpay.single.service.core.payment.notice.result;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayOrderAllocStatusEnum;
-import cn.daxpay.single.code.PayOrderRefundStatusEnum;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.result.PaymentCommonResult;
-import cn.daxpay.single.serializer.LocalDateTimeToTimestampSerializer;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayOrderAllocStatusEnum;
+import cn.daxpay.single.core.code.PayOrderRefundStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.result.PaymentCommonResult;
+import cn.daxpay.single.core.serializer.LocalDateTimeToTimestampSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/notice/result/RefundNoticeResult.java

@@ -1,9 +1,9 @@
 package cn.daxpay.single.service.core.payment.notice.result;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.RefundStatusEnum;
-import cn.daxpay.single.result.PaymentCommonResult;
-import cn.daxpay.single.serializer.LocalDateTimeToTimestampSerializer;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.RefundStatusEnum;
+import cn.daxpay.single.core.result.PaymentCommonResult;
+import cn.daxpay.single.core.serializer.LocalDateTimeToTimestampSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/service/PayAssistService.java

@@ -2,13 +2,12 @@ package cn.daxpay.single.service.core.payment.pay.service;
 
 import cn.bootx.platform.common.core.util.CollUtil;
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.code.PayOrderAllocStatusEnum;
-import cn.daxpay.single.code.PayOrderRefundStatusEnum;
-import cn.daxpay.single.code.PayStatusEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.payment.pay.PayParam;
-import cn.daxpay.single.result.pay.PayResult;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayOrderAllocStatusEnum;
+import cn.daxpay.single.core.code.PayOrderRefundStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
+import cn.daxpay.single.core.param.payment.pay.PayParam;
+import cn.daxpay.single.core.result.pay.PayResult;
 import cn.daxpay.single.service.common.context.PayLocal;
 import cn.daxpay.single.service.common.context.PlatformLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
@@ -16,8 +15,8 @@ import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.order.pay.service.PayOrderQueryService;
 import cn.daxpay.single.service.core.order.pay.service.PayOrderService;
 import cn.daxpay.single.service.core.payment.sync.service.PaySyncService;
-import cn.daxpay.single.util.OrderNoGenerateUtil;
-import cn.daxpay.single.util.PayUtil;
+import cn.daxpay.single.core.util.OrderNoGenerateUtil;
+import cn.daxpay.single.core.util.PayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -30,7 +29,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import static cn.daxpay.single.code.PayStatusEnum.*;
+import static cn.daxpay.single.core.code.PayStatusEnum.*;
 
 /**
  * 支付支持服务

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/service/PayExpiredTimeService.java

@@ -2,7 +2,7 @@ package cn.daxpay.single.service.core.payment.pay.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
 import cn.bootx.platform.common.spring.exception.RetryableException;
-import cn.daxpay.single.code.PayStatusEnum;
+import cn.daxpay.single.core.code.PayStatusEnum;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
 import cn.daxpay.single.service.core.payment.pay.dao.PayExpiredTimeRepository;
 import lombok.RequiredArgsConstructor;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/service/PayService.java

@@ -1,8 +1,7 @@
 package cn.daxpay.single.service.core.payment.pay.service;
 
-import cn.daxpay.single.exception.pay.PayUnsupportedMethodException;
-import cn.daxpay.single.param.payment.pay.PayParam;
-import cn.daxpay.single.result.pay.PayResult;
+import cn.daxpay.single.core.param.payment.pay.PayParam;
+import cn.daxpay.single.core.result.pay.PayResult;
 import cn.daxpay.single.service.common.context.PayLocal;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
 import cn.daxpay.single.service.core.order.pay.entity.PayOrder;
@@ -16,13 +15,12 @@ import com.baomidou.lock.LockInfo;
 import com.baomidou.lock.LockTemplate;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Objects;
 
-import static cn.daxpay.single.code.PayStatusEnum.SUCCESS;
+import static cn.daxpay.single.core.code.PayStatusEnum.SUCCESS;
 
 
 /**
@@ -183,16 +181,4 @@ public class PayService {
         return payAssistService.buildResult(payOrder);
     }
 
-
-    /**
-     * 根据传入的通道获取策略
-     * @return 支付策略
-     */
-    private AbsPayStrategy getStrategy(String channel) {
-        val beansOfType = SpringUtil.getBeansOfType(AbsPayStrategy.class);
-        return beansOfType.values().stream()
-                .filter(strategy -> strategy.getChannel().equals(channel))
-                .findFirst()
-                .orElseThrow(PayUnsupportedMethodException::new);
-    }
 }

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/AliPayStrategy.java

@@ -1,8 +1,7 @@
 package cn.daxpay.single.service.core.payment.pay.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.channel.AliPayParam;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.param.channel.AliPayParam;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayConfigService;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/UnionPayStrategy.java

@@ -1,8 +1,7 @@
 package cn.daxpay.single.service.core.payment.pay.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.param.channel.UnionPayParam;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.param.channel.UnionPayParam;
 import cn.daxpay.single.service.core.channel.union.entity.UnionPayConfig;
 import cn.daxpay.single.service.core.channel.union.service.UnionPayConfigService;
 import cn.daxpay.single.service.core.channel.union.service.UnionPayService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/WalletPayStrategy.java

@@ -1,10 +1,8 @@
 package cn.daxpay.single.service.core.payment.pay.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
-import cn.daxpay.single.exception.waller.WalletBannedException;
-import cn.daxpay.single.exception.waller.WalletLackOfBalanceException;
-import cn.daxpay.single.param.channel.WalletPayParam;
+import cn.daxpay.single.core.code.PayChannelEnum;
+import cn.daxpay.single.core.exception.PayFailureException;
+import cn.daxpay.single.core.param.channel.WalletPayParam;
 import cn.daxpay.single.service.code.WalletCode;
 import cn.daxpay.single.service.core.channel.wallet.entity.Wallet;
 import cn.daxpay.single.service.core.channel.wallet.entity.WalletConfig;
@@ -73,7 +71,7 @@ public class WalletPayStrategy extends AbsPayStrategy {
         }
         // 是否被禁用
         if (Objects.equals(WalletCode.STATUS_FORBIDDEN, this.wallet.getStatus())) {
-            throw new WalletBannedException();
+            throw new PayFailureException();
         }
         // 判断是否超过限额
         if (this.getPayParam().getAmount() > walletConfig.getLimitAmount()){
@@ -81,7 +79,7 @@ public class WalletPayStrategy extends AbsPayStrategy {
         }
         // 判断余额
         if (this.wallet.getBalance() < this.getPayParam().getAmount()) {
-            throw new WalletLackOfBalanceException();
+            throw new PayFailureException();
         }
         // 分账
         if (Objects.equals(this.getPayParam().getAllocation(),true)){

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/WeChatPayStrategy.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.pay.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.core.channel.wechat.entity.WeChatPayConfig;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayConfigService;
 import cn.daxpay.single.service.core.channel.wechat.service.WeChatPayService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/reconcile/service/ReconcileAssistService.java

@@ -3,7 +3,7 @@ package cn.daxpay.single.service.core.payment.reconcile.service;
 import cn.bootx.platform.common.core.function.CollectorsFunction;
 import cn.bootx.platform.common.core.util.CollUtil;
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.ReconcileTradeEnum;
+import cn.daxpay.single.core.code.ReconcileTradeEnum;
 import cn.daxpay.single.service.code.PaymentTypeEnum;
 import cn.daxpay.single.service.code.ReconcileDiffTypeEnum;
 import cn.daxpay.single.service.core.order.pay.dao.PayOrderManager;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/reconcile/service/ReconcileService.java

@@ -3,8 +3,7 @@ package cn.daxpay.single.service.core.payment.reconcile.service;
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.util.CollUtil;
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
-import cn.daxpay.single.exception.pay.PayFailureException;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.code.ReconcileFileTypeEnum;
 import cn.daxpay.single.service.code.ReconcileResultEnum;
 import cn.daxpay.single.service.common.local.PaymentContextLocal;
@@ -23,7 +22,7 @@ import cn.daxpay.single.service.dto.order.reconcile.ReconcileTradeDetailExcel;
 import cn.daxpay.single.service.func.AbsReconcileStrategy;
 import cn.daxpay.single.service.param.reconcile.ReconcileUploadParam;
 import cn.daxpay.single.service.util.PayStrategyFactory;
-import cn.daxpay.single.util.OrderNoGenerateUtil;
+import cn.daxpay.single.core.util.OrderNoGenerateUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.CharsetUtil;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/reconcile/strategy/AlipayReconcileStrategy.java

@@ -1,7 +1,7 @@
 package cn.daxpay.single.service.core.payment.reconcile.strategy;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.code.ReconcileFileTypeEnum;
 import cn.daxpay.single.service.core.channel.alipay.entity.AliPayConfig;
 import cn.daxpay.single.service.core.channel.alipay.service.AliPayConfigService;

daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/reconcile/strategy/UnionPayReconcileStrategy.java

@@ -1,6 +1,6 @@
 package cn.daxpay.single.service.core.payment.reconcile.strategy;
 
-import cn.daxpay.single.code.PayChannelEnum;
+import cn.daxpay.single.core.code.PayChannelEnum;
 import cn.daxpay.single.service.code.ReconcileFileTypeEnum;
 import cn.daxpay.single.service.core.channel.union.entity.UnionPayConfig;
 import cn.daxpay.single.service.core.channel.union.service.UnionPayConfigService;