diff --git a/_doc/Task.md b/_doc/Task.md index 6356dc4f9..e0e89a1a5 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -3,16 +3,15 @@ - [x] 支持撤销接口 - [x] 增加转账接口功能 - [ ] 转账订单功能 +- [ ] DEMO增加转账演示功能 - [ ] 转账同步接口 +- [ ] 手动发起分账是参数修正 - [x] 支付宝支持JSAPI方式支付 - [x] 支付宝SDK修改为官方SDK -- [ ] 手动发起分账是参数修正 - [ ] 细分各种支付异常类和编码(部分) -- [ ] 增加分账修复功能 - [x] 增加扫码获取微信OpenID和支付宝OpenId功能 - [x] 微信 - [x] 支付宝 -- [ ] DEMO增加转账演示功能 - [x] 支付宝微信等消息通知地址支持一键生成 - [x] 管理端界面支持扫码绑定对账接收方功能 - [x] 微信 @@ -49,6 +48,7 @@ - [ ] 增加类似支付宝应用通知的方式, 先支持http方式通信 - [ ] 优化前端各种状态颜色展示 - [ ] 修复功能优化, 更改为交易调整单 +- [ ] 增加分账修复功能 - [ ] 增加验签调试等功能的页面 - [ ] 聚合支付UA在前端判断, 提高响应速度 - [ ] 增加分账回调处理(支付宝) diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayCode.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayCode.java deleted file mode 100644 index 5e133eda7..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayCode.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.daxpay.single.code; - -/** - * 支付系统相关常量 - * @author xxm - * @since 2024/1/7 - */ -public interface DaxPayCode { - - /** 签名字段 */ - String FIELD_SIGN = "sign"; -} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayErrorCode.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayCommonErrorCode.java similarity index 91% rename from daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayErrorCode.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayCommonErrorCode.java index cc72742d5..54cae84a8 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayErrorCode.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/code/DaxPayCommonErrorCode.java @@ -6,7 +6,10 @@ package cn.daxpay.single.code; * @author xxm * @since 2020/12/7 */ -public interface DaxPayErrorCode { +public interface DaxPayCommonErrorCode { + + /** 未归类的错误 */ + int UNCLASSIFIED_ERROR = 10000; /** * 支付失败 diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/AmountAbnormalException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/AmountAbnormalException.java index ad6f88b48..fe8654955 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/AmountAbnormalException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/AmountAbnormalException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.pay; import cn.bootx.platform.common.core.exception.FatalException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 异常金额 @@ -12,11 +12,11 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class AmountAbnormalException extends FatalException { public AmountAbnormalException(String msg) { - super(DaxPayErrorCode.PAYMENT_AMOUNT_ABNORMAL, msg); + super(DaxPayCommonErrorCode.PAYMENT_AMOUNT_ABNORMAL, msg); } public AmountAbnormalException() { - super(DaxPayErrorCode.PAYMENT_AMOUNT_ABNORMAL, "异常金额"); + super(DaxPayCommonErrorCode.PAYMENT_AMOUNT_ABNORMAL, "异常金额"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayFailureException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayFailureException.java index ef1c50263..364c35b76 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayFailureException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayFailureException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.pay; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 支付错误 @@ -12,11 +12,11 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class PayFailureException extends BizException { public PayFailureException(String message) { - super(DaxPayErrorCode.PAY_FAILURE, message); + super(DaxPayCommonErrorCode.PAY_FAILURE, message); } public PayFailureException() { - super(DaxPayErrorCode.PAY_FAILURE, "支付失败"); + super(DaxPayCommonErrorCode.PAY_FAILURE, "支付失败"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayHasExistedException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayHasExistedException.java index a8fc45583..4da479c5b 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayHasExistedException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayHasExistedException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.pay; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 付款已存在 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class PayHasExistedException extends BizException { public PayHasExistedException() { - super(DaxPayErrorCode.PAYMENT_HAS_EXISTED, "付款已存在"); + super(DaxPayCommonErrorCode.PAYMENT_HAS_EXISTED, "付款已存在"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayIsProcessingException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayIsProcessingException.java index c866f09c6..b43439883 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayIsProcessingException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayIsProcessingException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.pay; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 付款正在处理中 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class PayIsProcessingException extends BizException { public PayIsProcessingException() { - super(DaxPayErrorCode.PAYMENT_IS_PROCESSING, "付款正在处理中"); + super(DaxPayCommonErrorCode.PAYMENT_IS_PROCESSING, "付款正在处理中"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayNotExistedException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayNotExistedException.java index 9d436afa6..5b64f78c5 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayNotExistedException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayNotExistedException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.pay; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 付款记录不存在 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class PayNotExistedException extends BizException { public PayNotExistedException() { - super(DaxPayErrorCode.PAYMENT_RECORD_NOT_EXISTED, "付款记录不存在"); + super(DaxPayCommonErrorCode.PAYMENT_RECORD_NOT_EXISTED, "付款记录不存在"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayUnsupportedMethodException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayUnsupportedMethodException.java index 128b973f2..4e5e4ad64 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayUnsupportedMethodException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/pay/PayUnsupportedMethodException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.pay; import cn.bootx.platform.common.core.exception.FatalException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 付款方式不支持异常 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class PayUnsupportedMethodException extends FatalException { public PayUnsupportedMethodException() { - super(DaxPayErrorCode.PAYMENT_METHOD_UNSUPPORT, "不支持的支付方式"); + super(DaxPayCommonErrorCode.PAYMENT_METHOD_UNSUPPORT, "不支持的支付方式"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletBannedException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletBannedException.java index 947c83e1c..efd4fc683 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletBannedException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletBannedException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.waller; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 钱包被禁用 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class WalletBannedException extends BizException { public WalletBannedException() { - super(DaxPayErrorCode.WALLET_BANNED, "钱包被禁用"); + super(DaxPayCommonErrorCode.WALLET_BANNED, "钱包被禁用"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletInfoNotExistException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletInfoNotExistException.java index bd812afb9..19ca6c8ee 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletInfoNotExistException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletInfoNotExistException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.waller; import cn.bootx.platform.common.core.exception.FatalException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 钱包信息不存在 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class WalletInfoNotExistException extends FatalException { public WalletInfoNotExistException() { - super(DaxPayErrorCode.WALLET_INFO_NOT_EXISTS, "钱包信息不存在"); + super(DaxPayCommonErrorCode.WALLET_INFO_NOT_EXISTS, "钱包信息不存在"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLackOfBalanceException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLackOfBalanceException.java index ec3fecb9f..0e4782880 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLackOfBalanceException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLackOfBalanceException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.waller; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 余额不足异常 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class WalletLackOfBalanceException extends BizException { public WalletLackOfBalanceException() { - super(DaxPayErrorCode.WALLET_BALANCE_NOT_ENOUGH, "余额不足异常"); + super(DaxPayCommonErrorCode.WALLET_BALANCE_NOT_ENOUGH, "余额不足异常"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLogError.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLogError.java index 749f836da..261628a1f 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLogError.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletLogError.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.waller; import cn.bootx.platform.common.core.exception.FatalException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 钱包日志错误 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class WalletLogError extends FatalException { public WalletLogError() { - super(DaxPayErrorCode.WALLET_LOG_ERROR, "钱包日志错误"); + super(DaxPayCommonErrorCode.WALLET_LOG_ERROR, "钱包日志错误"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletNotExistsException.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletNotExistsException.java index 36ce2fd6e..ed166abe5 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletNotExistsException.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/exception/waller/WalletNotExistsException.java @@ -1,7 +1,7 @@ package cn.daxpay.single.exception.waller; import cn.bootx.platform.common.core.exception.BizException; -import cn.daxpay.single.code.DaxPayErrorCode; +import cn.daxpay.single.code.DaxPayCommonErrorCode; /** * 钱包不存在 @@ -12,7 +12,7 @@ import cn.daxpay.single.code.DaxPayErrorCode; public class WalletNotExistsException extends BizException { public WalletNotExistsException() { - super(DaxPayErrorCode.WALLET_NOT_EXISTS, "钱包不存在"); + super(DaxPayCommonErrorCode.WALLET_NOT_EXISTS, "钱包不存在"); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/util/PaySignUtil.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/util/PaySignUtil.java index 912b7b596..aa14014bc 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/util/PaySignUtil.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/util/PaySignUtil.java @@ -14,8 +14,6 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import static cn.daxpay.single.code.DaxPayCode.FIELD_SIGN; - /** * 如果需要进行签名, * 1. 参数名ASCII码从小到大排序（字典序） @@ -27,6 +25,9 @@ import static cn.daxpay.single.code.DaxPayCode.FIELD_SIGN; @UtilityClass public class PaySignUtil { + private String FIELD_SIGN = "sign"; + + /** * 将参数转换为map对象. 使用ChatGPT生成 * 1. 参数名ASCII码从小到大排序（字典序） diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayCallbackController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/CallbackReceiverController.java similarity index 97% rename from daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayCallbackController.java rename to daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/CallbackReceiverController.java index 99991b8bc..455d47f4a 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayCallbackController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/CallbackReceiverController.java @@ -32,9 +32,9 @@ import java.util.Map; @Slf4j @Tag(name = "支付通道信息回调") @RestController -@RequestMapping("/callback/pay") +@RequestMapping("/unipay/callback") @AllArgsConstructor -public class PayCallbackController { +public class CallbackReceiverController { private final AliPayCallbackService aliPayCallbackService; diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayNoticeReceiverController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/NoticeReceiverController.java similarity index 94% rename from daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayNoticeReceiverController.java rename to daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/NoticeReceiverController.java index bacfb5fc6..6d7480c11 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayNoticeReceiverController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/NoticeReceiverController.java @@ -23,9 +23,9 @@ import java.util.Objects; @IgnoreAuth @Tag(name = "支付通道网关消息通知") @RestController -@RequestMapping("/callback/notice") +@RequestMapping("/unipay/notice") @RequiredArgsConstructor -public class PayNoticeReceiverController { +public class NoticeReceiverController { private final AliPayNoticeReceiverService aliPayNoticeReceiverService; diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayReturnController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayReturnController.java index cb6146f4a..3704d468f 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayReturnController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/PayReturnController.java @@ -14,33 +14,33 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; /** - * 支付同步通知控制器 + * 同步通知跳转控制器 * @author xxm * @since 2024/1/13 */ @IgnoreAuth -@Tag(name = "支付同步通知") +@Tag(name = "同步通知跳转控制器") @RestController -@RequestMapping("/return/pay") +@RequestMapping("/unipay/return") @RequiredArgsConstructor public class PayReturnController { private final PayReturnService payReturnService; - @Operation(summary = "支付宝同步跳转连接") - @GetMapping("/alipay") + @Operation(summary = "支付宝同步跳转通知") + @GetMapping("/pay/alipay") public ModelAndView alipay(AliPayReturnParam param){ String url = payReturnService.alipay(param); return new ModelAndView("redirect:" + url); } - @Operation(summary = "微信同步跳转连接") - @GetMapping("/wechat") + @Operation(summary = "微信同步跳转通知") + @GetMapping("/pay/wechat") public ModelAndView wechat(){ return null; } - @Operation(summary = "云闪付同步跳转连接") - @PostMapping("/union") + @Operation(summary = "云闪付同步跳转通知") + @PostMapping("/pay/union") public ModelAndView union(UnionPayReturnParam param){ String url = payReturnService.union(param); return new ModelAndView("redirect:" + url); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayConfigService.java index bde29a6df..8fbdbe30b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayConfigService.java @@ -81,14 +81,14 @@ public class AliPayConfigService { * 生成通知地址 */ public String generateNotifyUrl(){ - return platformConfigService.getConfig().getWebsiteUrl() + "/callback/pay/alipay"; + return platformConfigService.getConfig().getWebsiteUrl() + "/unipay/callback/alipay"; } /** * 生成同步跳转地址 */ public String generateReturnUrl(){ - return platformConfigService.getConfig().getWebsiteUrl() + "/return/pay/alipay"; + return platformConfigService.getConfig().getWebsiteUrl() + "/unipay/return/alipay"; } /** diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayConfigService.java index 4fac70aed..0c3d861cc 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/service/UnionPayConfigService.java @@ -81,14 +81,14 @@ public class UnionPayConfigService { * 生成通知地址 */ public String generateNotifyUrl(){ - return platformConfigService.getConfig().getWebsiteUrl() + "/callback/pay/union"; + return platformConfigService.getConfig().getWebsiteUrl() + "/unipay/callback/union"; } /** * 生成同步跳转地址 */ public String generateReturnUrl(){ - return platformConfigService.getConfig().getWebsiteUrl() + "/return/pay/union"; + return platformConfigService.getConfig().getWebsiteUrl() + "/unipay/return/union"; } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayConfigService.java index b17d4469a..29a1a1d04 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wechat/service/WeChatPayConfigService.java @@ -78,14 +78,14 @@ public class WeChatPayConfigService { * 生成微信通知地址 */ public String generateNotifyUrl(){ - return platformConfigService.getConfig().getWebsiteUrl() + "/callback/pay/wechat"; + return platformConfigService.getConfig().getWebsiteUrl() + "/unipay/callback/wechat"; } /** * 生成同步跳转地址 */ public String generateReturnUrl(){ - return platformConfigService.getConfig().getWebsiteUrl() + "/return/pay/wechat"; + return platformConfigService.getConfig().getWebsiteUrl() + "/unipay/return/wechat"; } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/service/RefundOrderQueryService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/service/RefundOrderQueryService.java index 41cdacbba..0f57130da 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/service/RefundOrderQueryService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/order/refund/service/RefundOrderQueryService.java @@ -76,7 +76,7 @@ public class RefundOrderQueryService { public RefundOrderResult queryRefundOrder(QueryRefundParam param) { // 校验参数 if (StrUtil.isBlank(param.getRefundNo()) && Objects.isNull(param.getBizRefundNo())){ - throw new PayFailureException("退款号或=商户退款号不能都为空"); + throw new PayFailureException("退款号或商户退款号不能都为空"); } // 查询退款单 RefundOrder refundOrder = this.findByBizOrRefundNo(param.getRefundNo(), param.getBizRefundNo())