From ed2b1c535b45571bbffcae396cf574f4112ca17c Mon Sep 17 00:00:00 2001 From: DaxPay Date: Fri, 14 Jun 2024 18:02:08 +0800 Subject: [PATCH] =?UTF-8?q?perf=20=E6=94=AF=E4=BB=98=E9=99=90=E9=A2=9D?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=BB=9F=E4=B8=80,=20=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8=E9=85=8D=E7=BD=AE=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 1 + daxpay-single-start/src/main/resources/application-dev.yml | 6 +----- daxpay-single-start/src/main/resources/application-prod.yml | 4 ---- .../single/service/configuration/DaxPayProperties.java | 5 ----- .../service/core/channel/alipay/entity/AliPayConfig.java | 2 +- .../service/core/channel/alipay/service/AliPayService.java | 2 +- .../service/core/channel/union/entity/UnionPayConfig.java | 2 +- .../service/core/channel/union/service/UnionPayService.java | 2 +- .../service/core/channel/wallet/entity/WalletConfig.java | 2 +- .../service/core/channel/wechat/entity/WeChatPayConfig.java | 2 +- .../core/channel/wechat/service/WeChatPayService.java | 2 +- .../core/payment/pay/strategy/WalletPayStrategy.java | 2 +- .../single/service/dto/channel/alipay/AliPayConfigDto.java | 2 +- .../single/service/dto/channel/union/UnionPayConfigDto.java | 2 +- .../single/service/dto/channel/wallet/WalletConfigDto.java | 3 +-- .../service/dto/channel/wechat/WeChatPayConfigDto.java | 2 +- .../service/param/channel/alipay/AliPayConfigParam.java | 2 +- .../service/param/channel/union/UnionPayConfigParam.java | 2 +- .../service/param/channel/wechat/WalletConfigParam.java | 2 +- .../service/param/channel/wechat/WeChatPayConfigParam.java | 2 +- 20 files changed, 18 insertions(+), 31 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index af96c922..a717582f 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -9,6 +9,7 @@ - [ ] DEMO增加转账演示功能 - [x] 支付宝微信等消息通知地址支持一键生成 - [ ] 管理端界面支持扫码绑定对账接收方功能 +- [x] 界面金额统一显示为分 - [ ] 上下文对象进行优化精简 - [x] 请求IP参数增加正则校验 - [x] 支付接口公共参数添加随机数字段, 预防重放问题 diff --git a/daxpay-single-start/src/main/resources/application-dev.yml b/daxpay-single-start/src/main/resources/application-dev.yml index 6f66a712..0ac702fd 100644 --- a/daxpay-single-start/src/main/resources/application-dev.yml +++ b/daxpay-single-start/src/main/resources/application-dev.yml @@ -160,12 +160,8 @@ dromara: storage-path: D:/data/files/ # 支付系统配置 dax-pay: - # 服务地址 - server-url: http://localhost:9000 - # 前端h5地址 + # h5访问地址 front-h5-url: http://pay1.bootx.cn/h5/# - # 前端web地址 - front-web-url: http://localhost:9000/# # 机器号码 machine-no: 63 # 当前环境，会影响订单号的生成 diff --git a/daxpay-single-start/src/main/resources/application-prod.yml b/daxpay-single-start/src/main/resources/application-prod.yml index 9468898e..0330a909 100644 --- a/daxpay-single-start/src/main/resources/application-prod.yml +++ b/daxpay-single-start/src/main/resources/application-prod.yml @@ -143,12 +143,8 @@ dromara: storage-path: D:/data/files/ # 支付系统配置 dax-pay: - # 服务地址 - server-url: http://pay1.bootx.cn # 前端h5地址 front-h5-url: http://pay1.bootx.cn/h5/# - # 前端web地址 - front-web-url: http://pay1.bootx.cn/# # 演示模块 demo: # 网关地址 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/configuration/DaxPayProperties.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/configuration/DaxPayProperties.java index b7e7b0fd..b53723b7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/configuration/DaxPayProperties.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/configuration/DaxPayProperties.java @@ -14,15 +14,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @Setter @ConfigurationProperties(prefix = "dax-pay") public class DaxPayProperties { - /** 服务地址 */ - private String serverUrl; /** 前端地址(h5) */ private String frontH5Url; - /** 前端地址(web) */ - private String frontWebUrl; - /** 机器码, 用于区分不同机器生成的流水号 */ private String machineNo = "56"; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java index 9af6af7c..418f1abf 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/entity/AliPayConfig.java @@ -48,7 +48,7 @@ public class AliPayConfig extends MpBaseEntity implements EntityBaseFunction alipayConfig.getSingleLimit()){ + if(payParam.getAmount() > alipayConfig.getLimitAmount()){ throw new PayFailureException("支付宝支付金额超过限额"); } // 支付参数开启分账, 配置未开启分账 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/entity/UnionPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/entity/UnionPayConfig.java index 02f0137d..fc53b23f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/entity/UnionPayConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/union/entity/UnionPayConfig.java @@ -44,7 +44,7 @@ public class UnionPayConfig extends MpBaseEntity implements EntityBaseFunction unionPayConfig.getSingleLimit()) { + if (payParam.getAmount() > unionPayConfig.getLimitAmount()) { throw new PayFailureException("云闪付支付金额超限"); } // 分账 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wallet/entity/WalletConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wallet/entity/WalletConfig.java index fdcb4528..9657a94c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wallet/entity/WalletConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/wallet/entity/WalletConfig.java @@ -35,7 +35,7 @@ public class WalletConfig extends MpBaseEntity implements EntityBaseFunction weChatPayConfig.getSingleLimit()) { + if (payParam.getAmount() > weChatPayConfig.getLimitAmount()) { throw new PayFailureException("微信支付金额超限"); } // 是否支持分账 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/WalletPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/WalletPayStrategy.java index 8d3a9f8e..178e0160 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/WalletPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/payment/pay/strategy/WalletPayStrategy.java @@ -76,7 +76,7 @@ public class WalletPayStrategy extends AbsPayStrategy { throw new WalletBannedException(); } // 判断是否超过限额 - if (this.getPayParam().getAmount() > walletConfig.getSingleLimit()){ + if (this.getPayParam().getAmount() > walletConfig.getLimitAmount()){ throw new PayFailureException("钱包支付金额超过限额"); } // 判断余额 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/alipay/AliPayConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/alipay/AliPayConfigDto.java index fcd44504..ea709414 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/alipay/AliPayConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/alipay/AliPayConfigDto.java @@ -33,7 +33,7 @@ public class AliPayConfigDto extends BaseDto implements Serializable { private Boolean allocation; @Schema(description = "支付限额") - private Integer singleLimit; + private Integer limitAmount; @Schema(description = "服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问") private String notifyUrl; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/union/UnionPayConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/union/UnionPayConfigDto.java index 1e985472..f67a078f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/union/UnionPayConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/union/UnionPayConfigDto.java @@ -29,7 +29,7 @@ public class UnionPayConfigDto extends BaseDto { private Boolean enable; @Schema(description = "支付限额") - private Integer singleLimit; + private Integer limitAmount; /** * 商户收款账号 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wallet/WalletConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wallet/WalletConfigDto.java index f65359ff..fef64bdd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wallet/WalletConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wallet/WalletConfigDto.java @@ -1,7 +1,6 @@ package cn.daxpay.single.service.dto.channel.wallet; import cn.bootx.platform.common.core.rest.dto.BaseDto; -import cn.bootx.table.modify.annotation.DbColumn; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,7 +29,7 @@ public class WalletConfigDto extends BaseDto { /** 单次支持支持多少钱 */ @Schema(description = "单次支持支持多少钱") - private Integer singleLimit; + private Integer limitAmount; /** 备注 */ @Schema(description = "备注") diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wechat/WeChatPayConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wechat/WeChatPayConfigDto.java index dd8369cb..5d0054f1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wechat/WeChatPayConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/channel/wechat/WeChatPayConfigDto.java @@ -35,7 +35,7 @@ public class WeChatPayConfigDto extends BaseDto implements Serializable { private Boolean allocation; @Schema(description = "支付限额") - private Integer singleLimit; + private Integer limitAmount; @Schema(description = "异步通知地址") private String notifyUrl; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/alipay/AliPayConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/alipay/AliPayConfigParam.java index f72073ce..cc4b60f4 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/alipay/AliPayConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/alipay/AliPayConfigParam.java @@ -25,7 +25,7 @@ public class AliPayConfigParam { private Boolean allocation; @Schema(description = "支付限额") - private Integer singleLimit; + private Integer limitAmount; @Schema(description = "服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问") private String notifyUrl; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/union/UnionPayConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/union/UnionPayConfigParam.java index 4e1104af..af1de2a8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/union/UnionPayConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/union/UnionPayConfigParam.java @@ -26,7 +26,7 @@ public class UnionPayConfigParam { private Boolean enable; @Schema(description = "支付限额") - private Integer singleLimit; + private Integer limitAmount; /** * 商户收款账号 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WalletConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WalletConfigParam.java index 7be86b17..66bf18e2 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WalletConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WalletConfigParam.java @@ -29,7 +29,7 @@ public class WalletConfigParam { /** 单次支付最多少金额 */ @Schema(description = "单次支付最多少金额") - private Integer singleLimit; + private Integer limitAmount; /** 备注 */ @Schema(description = "备注") diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WeChatPayConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WeChatPayConfigParam.java index bd198b5d..d4638d18 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WeChatPayConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/channel/wechat/WeChatPayConfigParam.java @@ -33,7 +33,7 @@ public class WeChatPayConfigParam { private Boolean allocation; @Schema(description = "支付限额") - private Integer singleLimit; + private Integer limitAmount; @Schema(description = "异步通知地址") private String notifyUrl;