From a35c7010fc7e8c2bf7ce2eb46e9a41d08f3f40c7 Mon Sep 17 00:00:00 2001 From: nws <3239709711@qq.com> Date: Mon, 8 Jan 2024 10:44:44 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 6 +- .../system/PayApiConfigController.java | 6 +- .../system/PayChannelInfoController.java | 20 ++++++ .../system/PayWayInfoController.java | 20 ++++++ .../system/PlatformConfigController.java | 6 +- .../system/WechatNoticeConfigController.java | 6 +- .../alipay/service/AliPayCloseService.java | 2 +- .../common/aop/PaymentVerifySignAop.java | 2 +- .../common/service/PaymentAssistService.java | 4 +- .../convert/PayApiConfigConvert.java | 8 +-- .../convert/PlatformConfigConvert.java | 6 +- .../convert/WechatNoticeConfigConvert.java | 6 +- .../{ => config}/dao/PayApiConfigManager.java | 4 +- .../{ => config}/dao/PayApiConfigMapper.java | 4 +- .../dao/PlatformConfigManager.java | 4 +- .../dao/PlatformConfigMapper.java | 4 +- .../dao/WechatNoticeConfigManager.java | 4 +- .../dao/WechatNoticeConfigMapper.java | 4 +- .../entity/OrderTimeoutConfig.java | 2 +- .../{ => config}/entity/PayApiCallRecord.java | 2 +- .../{ => config}/entity/PayApiConfig.java | 6 +- .../{ => config}/entity/PlatformConfig.java | 6 +- .../entity/WechatNoticeConfig.java | 6 +- .../service/PayApiConfigService.java | 10 +-- .../service/PlatformConfigService.java | 8 +-- .../service/WechatNoticeConfigService.java | 8 +-- .../convert/PayChannelInfoConvert.java | 21 ++++++ .../payinfo/convert/PayWayInfoConvert.java | 21 ++++++ .../payinfo/dao/PayChannelInfoManager.java | 18 ++++++ .../payinfo/dao/PayChannelInfoMapper.java | 14 ++++ .../system/payinfo/dao/PayWayInfoManager.java | 18 ++++++ .../system/payinfo/dao/PayWayInfoMapper.java | 14 ++++ .../system/payinfo/entity/PayChannelInfo.java | 64 +++++++++++++++++++ .../system/payinfo/entity/PayWayInfo.java | 50 +++++++++++++++ .../service/PayChannelInfoService.java | 53 +++++++++++++++ .../payinfo/service/PayWayInfoService.java | 53 +++++++++++++++ .../system/{ => config}/PayApiConfigDto.java | 2 +- .../{ => config}/PlatformConfigDto.java | 2 +- .../{ => config}/WechatNoticeConfigDto.java | 2 +- .../dto/system/payinfo/PayChannelInfoDto.java | 20 ++++++ .../dto/system/payinfo/PayWayInfoDto.java | 19 ++++++ .../handler/PayApiCheckHandler.java | 8 +-- .../{ => config}/PayApiConfigParam.java | 2 +- .../{ => config}/PlatformConfigParam.java | 2 +- .../{ => config}/WechatNoticeConfigParam.java | 2 +- .../system/payinfo/PayChannelInfoParam.java | 19 ++++++ .../param/system/payinfo/PayWayInfoParam.java | 19 ++++++ 47 files changed, 515 insertions(+), 72 deletions(-) create mode 100644 daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayChannelInfoController.java create mode 100644 daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayWayInfoController.java rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/convert/PayApiConfigConvert.java (54%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/convert/PlatformConfigConvert.java (56%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/convert/WechatNoticeConfigConvert.java (57%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/dao/PayApiConfigManager.java (83%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/dao/PayApiConfigMapper.java (63%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/dao/PlatformConfigManager.java (72%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/dao/PlatformConfigMapper.java (61%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/dao/WechatNoticeConfigManager.java (73%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/dao/WechatNoticeConfigMapper.java (61%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/entity/OrderTimeoutConfig.java (91%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/entity/PayApiCallRecord.java (88%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/entity/PayApiConfig.java (89%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/entity/PlatformConfig.java (84%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/entity/WechatNoticeConfig.java (86%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/service/PayApiConfigService.java (83%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/service/PlatformConfigService.java (76%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/{ => config}/service/WechatNoticeConfigService.java (77%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayChannelInfoConvert.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayWayInfoConvert.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoManager.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoMapper.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoManager.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoMapper.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayChannelInfo.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayWayInfo.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayChannelInfoService.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayWayInfoService.java rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/{ => config}/PayApiConfigDto.java (95%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/{ => config}/PlatformConfigDto.java (92%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/{ => config}/WechatNoticeConfigDto.java (83%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayChannelInfoDto.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayWayInfoDto.java rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/{core/system => }/handler/PayApiCheckHandler.java (87%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/{ => config}/PayApiConfigParam.java (93%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/{ => config}/PlatformConfigParam.java (92%) rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/{ => config}/WechatNoticeConfigParam.java (83%) create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayChannelInfoParam.java create mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayWayInfoParam.java diff --git a/_doc/Task.md b/_doc/Task.md index 9868a2aa6..eb3101abd 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -51,6 +51,6 @@ - [ ] 支付平台全局性配置 - [ ] 微信消息通知相关配置 - [ ] 钉钉消息通知配置 - - 支付宝接口升级为V3接口 - - 微信支付接口更新为V3接口 - - + - [ ] 支付宝接口升级为V3接口 + - [ ] 微信支付接口更新为V3接口 + - [ ] 增加验签调试等功能的页面 diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayApiConfigController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayApiConfigController.java index 7ef690613..7d01905c5 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayApiConfigController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayApiConfigController.java @@ -2,9 +2,9 @@ package cn.bootx.platform.daxpay.admin.controller.system; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.daxpay.service.core.system.service.PayApiConfigService; -import cn.bootx.platform.daxpay.service.dto.system.PayApiConfigDto; -import cn.bootx.platform.daxpay.service.param.system.PayApiConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.service.PayApiConfigService; +import cn.bootx.platform.daxpay.service.dto.system.config.PayApiConfigDto; +import cn.bootx.platform.daxpay.service.param.system.config.PayApiConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayChannelInfoController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayChannelInfoController.java new file mode 100644 index 000000000..741a27054 --- /dev/null +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayChannelInfoController.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.daxpay.admin.controller.system; + +import cn.bootx.platform.daxpay.service.core.system.payinfo.service.PayChannelInfoService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Tag(name = "") +@RestController +@RequestMapping("/") +@RequiredArgsConstructor +public class PayChannelInfoController { + private final PayChannelInfoService payChannelInfoService; +} diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayWayInfoController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayWayInfoController.java new file mode 100644 index 000000000..4116b7179 --- /dev/null +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayWayInfoController.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.daxpay.admin.controller.system; + +import cn.bootx.platform.daxpay.service.core.system.payinfo.service.PayWayInfoService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Tag(name = "") +@RestController +@RequestMapping("/") +@RequiredArgsConstructor +public class PayWayInfoController { + private final PayWayInfoService payWayInfoService; +} diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PlatformConfigController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PlatformConfigController.java index 8cbcf59c0..f1c8df976 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PlatformConfigController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PlatformConfigController.java @@ -2,9 +2,9 @@ package cn.bootx.platform.daxpay.admin.controller.system; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.daxpay.service.core.system.service.PlatformConfigService; -import cn.bootx.platform.daxpay.service.dto.system.PlatformConfigDto; -import cn.bootx.platform.daxpay.service.param.system.PlatformConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.service.PlatformConfigService; +import cn.bootx.platform.daxpay.service.dto.system.config.PlatformConfigDto; +import cn.bootx.platform.daxpay.service.param.system.config.PlatformConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/WechatNoticeConfigController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/WechatNoticeConfigController.java index a400aecfa..1368f222f 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/WechatNoticeConfigController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/WechatNoticeConfigController.java @@ -2,9 +2,9 @@ package cn.bootx.platform.daxpay.admin.controller.system; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.daxpay.service.core.system.service.WechatNoticeConfigService; -import cn.bootx.platform.daxpay.service.dto.system.WechatNoticeConfigDto; -import cn.bootx.platform.daxpay.service.param.system.WechatNoticeConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.service.WechatNoticeConfigService; +import cn.bootx.platform.daxpay.service.dto.system.config.WechatNoticeConfigDto; +import cn.bootx.platform.daxpay.service.param.system.config.WechatNoticeConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayCloseService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayCloseService.java index c8021f2ed..bc6eedd02 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayCloseService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayCloseService.java @@ -33,7 +33,7 @@ public class AliPayCloseService { * 关闭支付 此处使用交易关闭接口, 支付宝支持 交易关闭 和 交易撤销 两种关闭订单的方式, 区别如下 * 交易关闭: 只有订单在未支付的状态下才可以进行关闭, 商户不需要额外申请就有此接口的权限 * 交易撤销: 如果用户支付成功，会将此订单资金退还给用户. 限制时间为1天，过了24小时，该接口无法再使用。可以视为一个特殊的接口, 需要专门签约这个接口的权限 - * + *

* 1. 如果未查询到支付单,视为支付关闭, * 2. 如果返回"当前交易状态不支持此操作", 同步网关支付状态, 判断网关是否已经被关闭 * diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/aop/PaymentVerifySignAop.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/aop/PaymentVerifySignAop.java index c6dc78a5e..131981a89 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/aop/PaymentVerifySignAop.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/aop/PaymentVerifySignAop.java @@ -26,7 +26,7 @@ public class PaymentVerifySignAop { private final PaymentSignService paymentSignService; @Before("@annotation(paymentApi)") - public void beforeMethod(JoinPoint joinPoint, PaymentApi paymentApi) throws Throwable { + public void beforeMethod(JoinPoint joinPoint, PaymentApi paymentApi) { Object[] args = joinPoint.getArgs(); if (args.length == 0){ throw new PayFailureException("支付方法至少有一个参数，并且需要签名支付参数需要放在第一位"); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentAssistService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentAssistService.java index 995df4371..63ee0f052 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentAssistService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentAssistService.java @@ -4,8 +4,8 @@ import cn.bootx.platform.common.core.code.CommonCode; import cn.bootx.platform.daxpay.service.common.context.PlatformLocal; import cn.bootx.platform.daxpay.service.common.context.RequestLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.service.core.system.entity.PlatformConfig; -import cn.bootx.platform.daxpay.service.core.system.service.PlatformConfigService; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.core.system.config.service.PlatformConfigService; import cn.bootx.platform.daxpay.param.pay.PayCommonParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PayApiConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/PayApiConfigConvert.java similarity index 54% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PayApiConfigConvert.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/PayApiConfigConvert.java index 0b033a2d7..0d969dafa 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PayApiConfigConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/PayApiConfigConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.service.core.system.convert; +package cn.bootx.platform.daxpay.service.core.system.config.convert; -import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; -import cn.bootx.platform.daxpay.service.dto.system.PayApiConfigDto; -import cn.bootx.platform.daxpay.service.param.system.PayApiConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PayApiConfig; +import cn.bootx.platform.daxpay.service.dto.system.config.PayApiConfigDto; +import cn.bootx.platform.daxpay.service.param.system.config.PayApiConfigParam; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PlatformConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/PlatformConfigConvert.java similarity index 56% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PlatformConfigConvert.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/PlatformConfigConvert.java index 08d86c626..404b32176 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PlatformConfigConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/PlatformConfigConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.service.core.system.convert; +package cn.bootx.platform.daxpay.service.core.system.config.convert; -import cn.bootx.platform.daxpay.service.core.system.entity.PlatformConfig; -import cn.bootx.platform.daxpay.service.dto.system.PlatformConfigDto; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.dto.system.config.PlatformConfigDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/WechatNoticeConfigConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/WechatNoticeConfigConvert.java similarity index 57% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/WechatNoticeConfigConvert.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/WechatNoticeConfigConvert.java index b4fa528ee..c797844ec 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/WechatNoticeConfigConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/convert/WechatNoticeConfigConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.service.core.system.convert; +package cn.bootx.platform.daxpay.service.core.system.config.convert; -import cn.bootx.platform.daxpay.service.core.system.entity.WechatNoticeConfig; -import cn.bootx.platform.daxpay.service.dto.system.WechatNoticeConfigDto; +import cn.bootx.platform.daxpay.service.core.system.config.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.dto.system.config.WechatNoticeConfigDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PayApiConfigManager.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PayApiConfigManager.java index 30e858720..f3b73cf3f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PayApiConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.service.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.config.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PayApiConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PayApiConfigMapper.java similarity index 63% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PayApiConfigMapper.java index dc1d2212c..44c619359 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PayApiConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.service.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.config.dao; -import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PayApiConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PlatformConfigManager.java similarity index 72% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PlatformConfigManager.java index 35385c844..07850b4c1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PlatformConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.service.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.config.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.service.core.system.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PlatformConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PlatformConfigMapper.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PlatformConfigMapper.java index 76cb2e630..37836475c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/PlatformConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.service.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.config.dao; -import cn.bootx.platform.daxpay.service.core.system.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PlatformConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/WechatNoticeConfigManager.java similarity index 73% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/WechatNoticeConfigManager.java index 416cd8da0..839891829 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/WechatNoticeConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.service.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.config.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.service.core.system.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.core.system.config.entity.WechatNoticeConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/WechatNoticeConfigMapper.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/WechatNoticeConfigMapper.java index 2af2f7f6a..0b07dfb56 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/dao/WechatNoticeConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.service.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.config.dao; -import cn.bootx.platform.daxpay.service.core.system.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.core.system.config.entity.WechatNoticeConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/OrderTimeoutConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/OrderTimeoutConfig.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/OrderTimeoutConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/OrderTimeoutConfig.java index 2b7249587..4a2740607 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/OrderTimeoutConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/OrderTimeoutConfig.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.config.entity; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.table.modify.annotation.DbTable; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiCallRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PayApiCallRecord.java similarity index 88% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiCallRecord.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PayApiCallRecord.java index c06d18209..9c2a34940 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiCallRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PayApiCallRecord.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.config.entity; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.table.modify.annotation.DbTable; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PayApiConfig.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PayApiConfig.java index d2163b423..7da5849b1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PayApiConfig.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.service.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.config.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.service.core.system.convert.PayApiConfigConvert; -import cn.bootx.platform.daxpay.service.dto.system.PayApiConfigDto; +import cn.bootx.platform.daxpay.service.core.system.config.convert.PayApiConfigConvert; +import cn.bootx.platform.daxpay.service.dto.system.config.PayApiConfigDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PlatformConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PlatformConfig.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PlatformConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PlatformConfig.java index e3d56194e..60d2b3410 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PlatformConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/PlatformConfig.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.service.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.config.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.code.PaySignTypeEnum; -import cn.bootx.platform.daxpay.service.core.system.convert.PlatformConfigConvert; -import cn.bootx.platform.daxpay.service.dto.system.PlatformConfigDto; +import cn.bootx.platform.daxpay.service.core.system.config.convert.PlatformConfigConvert; +import cn.bootx.platform.daxpay.service.dto.system.config.PlatformConfigDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/WechatNoticeConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/WechatNoticeConfig.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/WechatNoticeConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/WechatNoticeConfig.java index f494411a9..0a7129518 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/WechatNoticeConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/entity/WechatNoticeConfig.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.service.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.config.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.service.core.system.convert.WechatNoticeConfigConvert; -import cn.bootx.platform.daxpay.service.dto.system.WechatNoticeConfigDto; +import cn.bootx.platform.daxpay.service.core.system.config.convert.WechatNoticeConfigConvert; +import cn.bootx.platform.daxpay.service.dto.system.config.WechatNoticeConfigDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PayApiConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/PayApiConfigService.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PayApiConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/PayApiConfigService.java index 5a7d3c10b..8e0207307 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PayApiConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/PayApiConfigService.java @@ -1,13 +1,13 @@ -package cn.bootx.platform.daxpay.service.core.system.service; +package cn.bootx.platform.daxpay.service.core.system.config.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.util.ResultConvertUtil; import cn.bootx.platform.daxpay.service.common.context.ApiInfoLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.service.core.system.dao.PayApiConfigManager; -import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; -import cn.bootx.platform.daxpay.service.dto.system.PayApiConfigDto; -import cn.bootx.platform.daxpay.service.param.system.PayApiConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.dao.PayApiConfigManager; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PayApiConfig; +import cn.bootx.platform.daxpay.service.dto.system.config.PayApiConfigDto; +import cn.bootx.platform.daxpay.service.param.system.config.PayApiConfigParam; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PlatformConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/PlatformConfigService.java similarity index 76% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PlatformConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/PlatformConfigService.java index c2bf6a79a..485bcc021 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PlatformConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/PlatformConfigService.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.service.core.system.service; +package cn.bootx.platform.daxpay.service.core.system.config.service; import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.daxpay.service.core.system.dao.PlatformConfigManager; -import cn.bootx.platform.daxpay.service.core.system.entity.PlatformConfig; -import cn.bootx.platform.daxpay.service.param.system.PlatformConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.core.system.config.dao.PlatformConfigManager; +import cn.bootx.platform.daxpay.service.param.system.config.PlatformConfigParam; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/WechatNoticeConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/WechatNoticeConfigService.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/WechatNoticeConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/WechatNoticeConfigService.java index 4c3f748a6..1457bdacc 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/WechatNoticeConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/config/service/WechatNoticeConfigService.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.service.core.system.service; +package cn.bootx.platform.daxpay.service.core.system.config.service; import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.daxpay.service.core.system.dao.WechatNoticeConfigManager; -import cn.bootx.platform.daxpay.service.core.system.entity.WechatNoticeConfig; -import cn.bootx.platform.daxpay.service.param.system.WechatNoticeConfigParam; +import cn.bootx.platform.daxpay.service.core.system.config.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.core.system.config.dao.WechatNoticeConfigManager; +import cn.bootx.platform.daxpay.service.param.system.config.WechatNoticeConfigParam; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayChannelInfoConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayChannelInfoConvert.java new file mode 100644 index 000000000..954c21a18 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayChannelInfoConvert.java @@ -0,0 +1,21 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.convert; + +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayChannelInfo; +import cn.bootx.platform.daxpay.service.dto.system.payinfo.PayChannelInfoDto; +import cn.bootx.platform.daxpay.service.param.system.payinfo.PayChannelInfoParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Mapper +public interface PayChannelInfoConvert { + PayChannelInfoConvert CONVERT = Mappers.getMapper(PayChannelInfoConvert.class); + + PayChannelInfo convert(PayChannelInfoParam in); + + PayChannelInfoDto convert(PayChannelInfo in); +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayWayInfoConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayWayInfoConvert.java new file mode 100644 index 000000000..b7edf95c9 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/convert/PayWayInfoConvert.java @@ -0,0 +1,21 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.convert; + +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayWayInfo; +import cn.bootx.platform.daxpay.service.dto.system.payinfo.PayWayInfoDto; +import cn.bootx.platform.daxpay.service.param.system.payinfo.PayWayInfoParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Mapper +public interface PayWayInfoConvert { + PayWayInfoConvert CONVERT = Mappers.getMapper(PayWayInfoConvert.class); + + PayWayInfo convert(PayWayInfoParam in); + + PayWayInfoDto convert(PayWayInfo in); +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoManager.java new file mode 100644 index 000000000..22f3e52d2 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoManager.java @@ -0,0 +1,18 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.dao; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayChannelInfo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Slf4j +@Repository +@RequiredArgsConstructor +public class PayChannelInfoManager extends BaseManager { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoMapper.java new file mode 100644 index 000000000..75dfa1308 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayChannelInfoMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.dao; + +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayChannelInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Mapper +public interface PayChannelInfoMapper extends BaseMapper { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoManager.java new file mode 100644 index 000000000..9e59f4931 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoManager.java @@ -0,0 +1,18 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.dao; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayWayInfo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Slf4j +@Repository +@RequiredArgsConstructor +public class PayWayInfoManager extends BaseManager { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoMapper.java new file mode 100644 index 000000000..769aaafef --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/dao/PayWayInfoMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.dao; + +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayWayInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Mapper +public interface PayWayInfoMapper extends BaseMapper { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayChannelInfo.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayChannelInfo.java new file mode 100644 index 000000000..0fa678cee --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayChannelInfo.java @@ -0,0 +1,64 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.entity; + +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.daxpay.service.core.system.payinfo.convert.PayChannelInfoConvert; +import cn.bootx.platform.daxpay.service.dto.system.payinfo.PayChannelInfoDto; +import cn.bootx.platform.daxpay.service.param.system.payinfo.PayChannelInfoParam; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbTable; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 支付通道 + * 都是在代码中定义好的，界面上只做展示和部分信息的修改用，不可以进行增删相关的操作 + * @author xxm + * @since 2024/1/8 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@DbTable(comment = "支付通道信息") +@TableName("pay_channel_info") +public class PayChannelInfo extends MpBaseEntity implements EntityBaseFunction { + + /** 需要与系统中配置的枚举一致 */ + @DbColumn(comment = "代码") + @TableField(updateStrategy = FieldStrategy.NEVER) + private String code; + + /** 需要与系统中配置的枚举一致 */ + @DbColumn(comment = "名称") + @TableField(updateStrategy = FieldStrategy.NEVER) + private String name; + + /** logo图片 */ + @DbColumn(comment = "ICON") + private Long iconId; + + /** 卡牌背景色 */ + @DbColumn(comment = "卡牌背景色") + private String bgColor; + + /** 备注 */ + @DbColumn(comment = "备注") + private String remark; + + public static PayChannelInfo init(PayChannelInfoParam in){ + return PayChannelInfoConvert.CONVERT.convert(in); + } + + /** + * 转换 + */ + @Override + public PayChannelInfoDto toDto() { + return PayChannelInfoConvert.CONVERT.convert(this); + } + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayWayInfo.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayWayInfo.java new file mode 100644 index 000000000..fa7858190 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/entity/PayWayInfo.java @@ -0,0 +1,50 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.entity; + +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.daxpay.service.core.system.payinfo.convert.PayWayInfoConvert; +import cn.bootx.platform.daxpay.service.dto.system.payinfo.PayWayInfoDto; +import cn.bootx.table.modify.annotation.DbColumn; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 支付方式 + * 都是在代码中定义好的，界面上只做展示用，不可以进行增删相关的操作 + * @author xxm + * @since 2024/1/8 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +public class PayWayInfo extends MpBaseEntity implements EntityBaseFunction { + + /** 需要与系统中配置的枚举一致 */ + @DbColumn(comment = "代码") + @TableField(updateStrategy = FieldStrategy.NEVER) + private String code; + + /** 需要与系统中配置的枚举一致 */ + @DbColumn(comment = "名称") + @TableField(updateStrategy = FieldStrategy.NEVER) + private String name; + + /** 备注 */ + @DbColumn(comment = "备注") + private String remark; + + public static PayWayInfoDto convert(PayWayInfo in) { + return PayWayInfoConvert.CONVERT.convert(in); + } + + /** + * 转换 + */ + @Override + public PayWayInfoDto toDto() { + return PayWayInfoConvert.CONVERT.convert(this); + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayChannelInfoService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayChannelInfoService.java new file mode 100644 index 000000000..cb2f79676 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayChannelInfoService.java @@ -0,0 +1,53 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.daxpay.service.core.system.payinfo.dao.PayChannelInfoManager; +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayChannelInfo; +import cn.bootx.platform.daxpay.service.dto.system.payinfo.PayChannelInfoDto; +import cn.bootx.platform.daxpay.service.param.system.payinfo.PayChannelInfoParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 支付通道信息 + * @author xxm + * @since 2024/1/8 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class PayChannelInfoService { + private final PayChannelInfoManager manager; + + /** + * 列表 + */ + public List list(){ + return manager.findAll().stream() + .map(PayChannelInfo::toDto) + .collect(Collectors.toList()); + } + + /** + * 单条 + */ + public PayChannelInfoDto findById(Long id){ + return ResultConvertUtil.dtoConvert(manager.findById(id)); + } + + /** + * 更新 + */ + public void update(PayChannelInfoParam param){ + PayChannelInfo info = manager.findById(param.getId()).orElseThrow(DataNotExistException::new); + BeanUtil.copyProperties(param,info, CopyOptions.create().ignoreNullValue()); + manager.updateById(info); + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayWayInfoService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayWayInfoService.java new file mode 100644 index 000000000..5ee930ee7 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/payinfo/service/PayWayInfoService.java @@ -0,0 +1,53 @@ +package cn.bootx.platform.daxpay.service.core.system.payinfo.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.daxpay.service.core.system.payinfo.dao.PayWayInfoManager; +import cn.bootx.platform.daxpay.service.core.system.payinfo.entity.PayWayInfo; +import cn.bootx.platform.daxpay.service.dto.system.payinfo.PayWayInfoDto; +import cn.bootx.platform.daxpay.service.param.system.payinfo.PayWayInfoParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 支付方式信息 + * @author xxm + * @since 2024/1/8 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class PayWayInfoService { + private final PayWayInfoManager manager; + + /** + * 列表 + */ + public List list(){ + return manager.findAll().stream() + .map(PayWayInfo::toDto) + .collect(Collectors.toList()); + } + + /** + * 单条 + */ + public PayWayInfoDto findById(Long id){ + return ResultConvertUtil.dtoConvert(manager.findById(id)); + } + + /** + * 更新 + */ + public void update(PayWayInfoParam param){ + PayWayInfo info = manager.findById(param.getId()).orElseThrow(DataNotExistException::new); + BeanUtil.copyProperties(param,info, CopyOptions.create().ignoreNullValue()); + manager.updateById(info); + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PayApiConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/PayApiConfigDto.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PayApiConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/PayApiConfigDto.java index dd3f64c37..c5fe97589 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PayApiConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/PayApiConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.dto.system; +package cn.bootx.platform.daxpay.service.dto.system.config; import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PlatformConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/PlatformConfigDto.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PlatformConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/PlatformConfigDto.java index 52cd1bbd4..332472a99 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PlatformConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/PlatformConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.dto.system; +package cn.bootx.platform.daxpay.service.dto.system.config; import cn.bootx.platform.daxpay.code.PaySignTypeEnum; import cn.bootx.table.modify.annotation.DbColumn; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/WechatNoticeConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/WechatNoticeConfigDto.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/WechatNoticeConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/WechatNoticeConfigDto.java index dc0d5547d..9bbffe613 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/WechatNoticeConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/config/WechatNoticeConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.dto.system; +package cn.bootx.platform.daxpay.service.dto.system.config; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayChannelInfoDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayChannelInfoDto.java new file mode 100644 index 000000000..0665ee6ce --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayChannelInfoDto.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.daxpay.service.dto.system.payinfo; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@Schema(title = "") +public class PayChannelInfoDto extends BaseDto { + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayWayInfoDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayWayInfoDto.java new file mode 100644 index 000000000..3303d4289 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/payinfo/PayWayInfoDto.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.daxpay.service.dto.system.payinfo; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@Schema(title = "") +public class PayWayInfoDto extends BaseDto { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/handler/PayApiCheckHandler.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/handler/PayApiCheckHandler.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/handler/PayApiCheckHandler.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/handler/PayApiCheckHandler.java index ab8afe8de..a404e9a66 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/handler/PayApiCheckHandler.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/handler/PayApiCheckHandler.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.service.core.system.handler; +package cn.bootx.platform.daxpay.service.handler; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.daxpay.service.annotation.PaymentApi; import cn.bootx.platform.daxpay.service.common.context.PaymentContext; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.service.core.system.dao.PayApiConfigManager; -import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; -import cn.bootx.platform.daxpay.service.core.system.service.PayApiConfigService; +import cn.bootx.platform.daxpay.service.core.system.config.dao.PayApiConfigManager; +import cn.bootx.platform.daxpay.service.core.system.config.entity.PayApiConfig; +import cn.bootx.platform.daxpay.service.core.system.config.service.PayApiConfigService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.starter.auth.service.RouterCheck; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PayApiConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/PayApiConfigParam.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PayApiConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/PayApiConfigParam.java index f2d89b8e7..42070f660 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PayApiConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/PayApiConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.param.system; +package cn.bootx.platform.daxpay.service.param.system.config; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PlatformConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/PlatformConfigParam.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PlatformConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/PlatformConfigParam.java index 3bec85369..657d7ef9e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PlatformConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/PlatformConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.param.system; +package cn.bootx.platform.daxpay.service.param.system.config; import cn.bootx.platform.daxpay.code.PaySignTypeEnum; import cn.bootx.table.modify.annotation.DbColumn; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/WechatNoticeConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/WechatNoticeConfigParam.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/WechatNoticeConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/WechatNoticeConfigParam.java index 814418f75..7d34ce6a1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/WechatNoticeConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/config/WechatNoticeConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.service.param.system; +package cn.bootx.platform.daxpay.service.param.system.config; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayChannelInfoParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayChannelInfoParam.java new file mode 100644 index 000000000..7b298d6c9 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayChannelInfoParam.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.daxpay.service.param.system.payinfo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Data +@Accessors(chain = true) +@Schema(title = "") +public class PayChannelInfoParam { + + @Schema(description= "主键") + private Long id; +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayWayInfoParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayWayInfoParam.java new file mode 100644 index 000000000..652ecd19d --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/payinfo/PayWayInfoParam.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.daxpay.service.param.system.payinfo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * + * @author xxm + * @since 2024/1/8 + */ +@Data +@Accessors(chain = true) +@Schema(title = "") +public class PayWayInfoParam { + + @Schema(description= "主键") + private Long id; +}