diff --git a/_config/sql/dax-pay.sql b/_config/sql/dax-pay.sql index dd021bf97..cae2d8e9e 100644 --- a/_config/sql/dax-pay.sql +++ b/_config/sql/dax-pay.sql @@ -266,7 +266,7 @@ INSERT INTO `iam_perm_menu` VALUES (1584380679478779904, 'dax-pay', 158437960218 INSERT INTO `iam_perm_menu` VALUES (1584380824308097024, 'dax-pay', 1584379602188574720, '素材管理', 'WechatMediaList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/media/WechatMediaList.vue', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:40', 1414143554414059520, '2022-10-27 16:38:47', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'dax-pay', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WecomRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-11-12 20:58:25', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'dax-pay', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-11-12 20:58:37', 6, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'dax-pay', 1582276184120709120, '支付渠道菜单', 'PayChannel', NULL, b'0', '', b'1', b'1', 'Layout', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:13:36', 1414143554414059520, '2023-06-15 20:09:59', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'dax-pay', 1582276184120709120, '支付通道菜单', 'PayChannel', NULL, b'0', '', b'1', b'1', 'Layout', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:13:36', 1414143554414059520, '2023-06-15 20:09:59', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1584382723186958336, 'dax-pay', NULL, '支付订单', 'PayOrder', NULL, b'0', 'ant-design:copy-filled', b'0', b'0', 'Layout', NULL, '/payment/order', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:12', 1414143554414059520, '2023-07-11 09:07:48', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1584382815407120384, 'dax-pay', NULL, '通知记录', 'PayNotify', NULL, b'0', 'ant-design:delete-row-outlined', b'0', b'0', 'Layout', NULL, '/payment/notify', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:34', 1414143554414059520, '2023-07-17 09:35:16', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1584383492338425856, 'dax-pay', 1582276184120709120, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:16', 1414143554414059520, '2022-10-24 11:17:16', 0, 0); @@ -287,7 +287,7 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'dax-pay', 155220798251 INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'dax-pay', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1660185276763594752, 'dax-pay', 1582276184120709120, '商户管理', 'Merchant', NULL, b'0', '', b'0', b'0', '/modules/payment/merchant/MerchantInfoList', NULL, '/payment/merchant', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-05-21 15:26:29', 1414143554414059520, '2023-05-21 15:27:58', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1660247003681181696, 'dax-pay', 1582276184120709120, '商户应用', 'MchApplicationList', NULL, b'0', '', b'0', b'0', '/modules/payment/app/MchApplicationList', NULL, '/payment/mch/app', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-05-21 19:31:46', 1414143554414059520, '2023-05-23 10:28:42', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1661556612357128192, 'dax-pay', 1582276184120709120, '支付渠道', 'ChannelConfig', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/config/PayChannelConfigList', NULL, '/payment/channel/config', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-05-25 10:15:41', 1414143554414059520, '2023-06-15 20:10:14', 3, 0); +INSERT INTO `iam_perm_menu` VALUES (1661556612357128192, 'dax-pay', 1582276184120709120, '支付通道', 'ChannelConfig', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/config/PayChannelConfigList', NULL, '/payment/channel/config', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-05-25 10:15:41', 1414143554414059520, '2023-06-15 20:10:14', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1670605512011345920, 'dax-pay', NULL, '演示实例', 'PayDemo', NULL, b'0', 'ant-design:gateway-outlined', b'0', b'0', 'Layout', NULL, '/payment/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-06-19 09:32:47', 1414143554414059520, '2023-07-11 09:10:21', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1670605893923696640, 'dax-pay', 1670605512011345920, '结算台支付演示', 'cashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-06-19 09:34:18', 1414143554414059520, '2023-06-19 09:34:18', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1670987342170497024, 'dax-pay', 1670605512011345920, '简单支付', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier', NULL, '/payment/demo/SimpleCashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-06-20 10:50:02', 1414143554414059520, '2023-06-20 10:59:01', 1, 0); @@ -329,10 +329,10 @@ INSERT INTO `base_dict` VALUES (1439961232651034624, 'MessageTemplateCode', '消 INSERT INTO `base_dict` VALUES (1452836604783845376, 'SocialType', '三方系统类型', b'1', '系统属性', '三方系统类型', 1399985191002447872, '2021-10-26 11:16:54', 1399985191002447872, '2022-05-11 19:48:28', 0, 3); INSERT INTO `base_dict` VALUES (1452843488735621120, 'ParamType', '参数类型', b'1', '系统属性', '参数类型', 1399985191002447872, '2021-10-26 11:44:15', 1399985191002447872, '2022-05-11 19:48:21', 0, 2); INSERT INTO `base_dict` VALUES (1496024933900169216, 'Political', '政治面貌', b'1', '基础数据', '政治面貌', 1399985191002447872, '2022-02-22 15:31:54', 1399985191002447872, '2022-05-11 19:48:04', 0, 1); -INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付渠道', b'1', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); +INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付通道', b'1', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); INSERT INTO `base_dict` VALUES (1496723207565058048, 'PayWay', '支付方式', b'1', '支付服务', '扫码支付、Wap、App支付等', 1399985191002447872, '2022-02-24 13:46:35', 1399985191002447872, '2022-05-11 19:47:46', 0, 1); INSERT INTO `base_dict` VALUES (1497140849954185216, 'PayStatus', '支付状态', b'1', '支付服务', '支付中,成功,失败等', 1399985191002447872, '2022-02-25 17:26:09', 1399985191002447872, '2022-05-11 19:47:40', 0, 2); -INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付渠道', b'1', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); +INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付通道', b'1', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); INSERT INTO `base_dict` VALUES (1502276739978473472, 'WalletStatus', '钱包状态', b'1', '支付服务', '钱包状态', 1399985191002447872, '2022-03-11 21:34:20', 1399985191002447872, '2022-05-11 19:47:33', 0, 2); INSERT INTO `base_dict` VALUES (1502624515799085056, 'WalletLogType', '钱包日志类型', b'1', '支付服务', '钱包日志类型', 1399985191002447872, '2022-03-12 20:36:17', 1399985191002447872, '2022-05-11 19:47:29', 0, 1); INSERT INTO `base_dict` VALUES (1502624632392347648, 'WalletLogOperation', '钱包日志操作类型', b'1', '支付服务', '钱包日志操作类型', 1399985191002447872, '2022-03-12 20:36:44', 1399985191002447872, '2022-05-11 19:47:21', 0, 1); @@ -434,7 +434,7 @@ CREATE TABLE `pay_channel_config` ( `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付渠道配置' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付通道配置' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of pay_channel_config @@ -1507,7 +1507,7 @@ CREATE TABLE `pay_sync_record` ( `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '支付记录id', `mch_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户编码', `mch_app_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户应用编码', - `pay_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付渠道', + `pay_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付通道', `sync_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '通知消息', `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '同步状态', `sync_time` datetime(0) NULL DEFAULT NULL COMMENT '同步时间', @@ -1565,12 +1565,12 @@ CREATE TABLE `pay_payment` ( `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `async_pay_mode` bit(1) NULL DEFAULT NULL COMMENT '是否是异步支付', - `async_pay_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '异步支付渠道', + `async_pay_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '异步支付通道', `amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '金额', `refundable_balance` decimal(10, 2) NULL DEFAULT NULL COMMENT '可退款余额', `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码', `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `pay_channel_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付渠道信息列表', + `pay_channel_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付通道信息列表', `refundable_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '退款信息列表', `pay_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付状态', `pay_time` datetime(0) NULL DEFAULT NULL COMMENT '支付时间', @@ -1622,7 +1622,7 @@ CREATE TABLE `pay_pay_notify_record` ( `id` bigint(20) NOT NULL COMMENT '主键', `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '支付记录id', `notify_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '通知消息', - `pay_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付渠道', + `pay_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付通道', `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理状态', `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息', `notify_time` datetime(0) NULL DEFAULT NULL COMMENT '回调时间', @@ -1676,7 +1676,7 @@ DROP TABLE IF EXISTS `pay_mch_app_config`; CREATE TABLE `pay_mch_app_config` ( `id` bigint(20) NOT NULL COMMENT '主键', `config_id` bigint(20) NULL DEFAULT NULL COMMENT '关联配置ID', - `channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付渠道编码', + `channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付通道编码', `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', diff --git a/_doc/Task.md b/_doc/Task.md index c898ac221..5eebfa43a 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,20 +1,29 @@ 2.0.0 -- x 参数签名机制 -- x 开放接口供第三方调用 -- 增加回调机制 -- 增加消息通知机制 -- 支付超时取消支付单 -- 新增支付单预警功能, 处理支付单与网关状态不一致且无法自动修复的情况 -- 记录支付修复单的情况, 主要分为自动修复, 人工介入 +- 已经完成的 + - 参数签名和验签机制 + - 开放接口供第三方调用 + - 将零散的上下文对象进行抽取为统一的上下文对象 + - 拆分原有的策略类，实现粒度更细 + - 去除用户概念，作为独立的支付网关使用， 不与其他系统产生耦合性 - 2023-12-31: - 支付关闭相关逻辑 - 各支付通道补充相关未实现的逻辑 - 支付订单修复逻辑, 用于回调和支付同步后不一致的情况处理 - 2024-01-01: - 支付订单修复逻辑, 用于回调和支付同步后不一致的情况处理 -- 2024-01-02: + - 2024-01-02: + - 添加管理端的各类`Controller` + - x 支持定时同步支付中订单状态, 借助订单超时任务 + - 订单取消/修复/取消/同步添加分布式锁, 防止操作订单时出现重复操作 +- **任务池** - 支付配置支持数据库配置和配置文件配置 - 支付订单的各类操作接入订单超时任务处理 - 超时任务处理支持轮训表+Redis过期事件 - - 支持定时同步支付中订单状态, 借助订单超时任务 - - 订单取消/修复/取消/同步添加分布式锁, 防止操作订单时出现重复操作 + - 增加回调机制 + - 增加消息通知机制 + - 新增支付单预警功能, 处理支付单与网关状态不一致且无法自动修复的情况 + - 记录支付修复单的情况, 主要分为自动修复, 人工介入 + - 支付平台全局性配置 + - 微信消息通知相关配置 + - 钉钉消息通知配置 + - diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/AlipayConfigController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/AlipayConfigController.java index e3cb9a0d4..331cea695 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/AlipayConfigController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/AlipayConfigController.java @@ -3,9 +3,9 @@ package cn.bootx.platform.daxpay.admin.controller.channel; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.dto.LabelValue; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayConfigService; -import cn.bootx.platform.daxpay.dto.channel.alipay.AliPayConfigDto; -import cn.bootx.platform.daxpay.param.channel.alipay.AliPayConfigParam; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService; +import cn.bootx.platform.daxpay.service.dto.channel.alipay.AliPayConfigDto; +import cn.bootx.platform.daxpay.service.param.channel.alipay.AliPayConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -28,6 +28,12 @@ public class AlipayConfigController { private final AliPayConfigService alipayConfigService; + @Operation(summary = "获取配置") + @GetMapping("/getConfig") + public ResResult getConfig() { + return Res.ok(alipayConfigService.getConfig().toDto()); + } + @Operation(summary = "更新") @PostMapping("/update") public ResResult update(@RequestBody AliPayConfigParam param) { @@ -35,12 +41,6 @@ public class AlipayConfigController { return Res.ok(); } - @Operation(summary = "获取配置") - @GetMapping("/getConfig") - public ResResult getConfig() { - return Res.ok(alipayConfigService.getConfig().toDto()); - } - @Operation(summary = "支付宝支持支付方式") @GetMapping("/findPayWays") public ResResult> findPayWays() { diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WeChatPayConfigController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WeChatPayConfigController.java index 3d9691056..acfcb4501 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WeChatPayConfigController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WeChatPayConfigController.java @@ -3,9 +3,9 @@ package cn.bootx.platform.daxpay.admin.controller.channel; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.dto.LabelValue; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayConfigService; -import cn.bootx.platform.daxpay.dto.channel.wechat.WeChatPayConfigDto; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayConfigParam; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService; +import cn.bootx.platform.daxpay.service.dto.channel.wechat.WeChatPayConfigDto; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayConfigParam; import cn.hutool.core.codec.Base64; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,19 +28,18 @@ public class WeChatPayConfigController { private final WeChatPayConfigService weChatPayConfigService; - @Operation(summary = "更新") - @PostMapping("/update") - public ResResult update(@RequestBody WeChatPayConfigParam param) { - weChatPayConfigService.update(param); - return Res.ok(); - } - @Operation(summary = "获取配置") @GetMapping("/getConfig") public ResResult getConfig() { return Res.ok(weChatPayConfigService.getConfig().toDto()); } + @Operation(summary = "更新") + @PostMapping("/update") + public ResResult update(@RequestBody WeChatPayConfigParam param) { + weChatPayConfigService.update(param); + return Res.ok(); + } @Operation(summary = "微信支持支付方式") @GetMapping("/findPayWays") public ResResult> findPayWays() { 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 new file mode 100644 index 000000000..7ef690613 --- /dev/null +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PayApiConfigController.java @@ -0,0 +1,43 @@ +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 io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 支付接口配置 + * @author xxm + * @since 2024/1/2 + */ +@Tag(name = "支付接口配置") +@RestController +@RequestMapping("/pay/api/config") +@RequiredArgsConstructor +public class PayApiConfigController { + private final PayApiConfigService payApiConfigService; + + @Operation(summary = "根据ID获取") + @GetMapping("/findById") + public ResResult findById(Long id){ + return Res.ok(payApiConfigService.findById(id)); + } + @Operation(summary = "获取全部") + @GetMapping("/findAll") + public ResResult> findAll(){ + return Res.ok(payApiConfigService.findAll()); + } + @Operation(summary = "更新") + @PostMapping("/update") + public ResResult update(@RequestBody PayApiConfigParam param){ + payApiConfigService.update(param); + return Res.ok(); + } +} 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 new file mode 100644 index 000000000..8cbcf59c0 --- /dev/null +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/PlatformConfigController.java @@ -0,0 +1,37 @@ +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 io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 平台配置项 + * @author xxm + * @since 2024/1/2 + */ +@Tag(name = "平台配置项") +@RestController +@RequestMapping("/platform/config") +@RequiredArgsConstructor +public class PlatformConfigController { + private final PlatformConfigService platformConfigService; + + @Operation(summary = "平台配置项") + @GetMapping("/getConfig") + public ResResult getConfig(){ + return Res.ok(platformConfigService.getConfig().toDto()); + } + + @Operation(summary = "更新平台配置项") + @PostMapping("/update") + public ResResult update(@RequestBody PlatformConfigParam param){ + platformConfigService.update(param); + return Res.ok(); + } +} 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 new file mode 100644 index 000000000..a400aecfa --- /dev/null +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/system/WechatNoticeConfigController.java @@ -0,0 +1,37 @@ +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 io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 微信消息通知配置 + * @author xxm + * @since 2024/1/2 + */ +@Tag(name = "微信消息通知配置") +@RestController +@RequestMapping("/wx/notice") +@RequiredArgsConstructor +public class WechatNoticeConfigController { + private final WechatNoticeConfigService configService; + + @Operation(summary = "获取微信消息通知配置") + @GetMapping("/getConfig") + public ResResult getConfig() { + return Res.ok(configService.getConfig().toDto()); + } + + @Operation(summary = "更新微信消息通知配置") + @PostMapping("/update") + public ResResult update(@RequestBody WechatNoticeConfigParam param) { + configService.update(param); + return Res.ok(); + } +} diff --git a/daxpay-single/daxpay-single-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-single/daxpay-single-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b9b464d23..c38bb6110 100644 --- a/daxpay-single/daxpay-single-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/daxpay-single/daxpay-single-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.platform.daxpay.DaxPaySingleAdminApp +cn.bootx.platform.daxpay.admin.DaxPaySingleAdminApp diff --git a/daxpay-single/daxpay-single-core/pom.xml b/daxpay-single/daxpay-single-core/pom.xml index 8208ddcaa..c0b6d11ea 100644 --- a/daxpay-single/daxpay-single-core/pom.xml +++ b/daxpay-single/daxpay-single-core/pom.xml @@ -5,7 +5,7 @@ 4.0.0 cn.bootx.platform - dax-pay + daxpay-single 2.0.0 diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayChannelEnum.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayChannelEnum.java index 1ad8f062e..9dece64b8 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayChannelEnum.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayChannelEnum.java @@ -39,7 +39,7 @@ public enum PayChannelEnum { return Arrays.stream(values()) .filter(e -> Objects.equals(code, e.getCode())) .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付渠道")); + .orElseThrow(() -> new PayFailureException("不存在的支付通道")); } /** 支付宝 UA */ diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java index e6dd2678f..0063b90e3 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayStatusEnum.java @@ -17,7 +17,6 @@ public enum PayStatusEnum { FAIL("fail","失败"), CANCEL("cancel","支付取消"), CLOSE("close","支付关闭"), - /** 超时取消 */ TIMEOUT("timeout","超时取消"), PARTIAL_REFUND("partial_refund","部分退款"), REFUNDED("refunded","全部退款"); diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java index 6f0905281..f682b2b41 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java @@ -23,6 +23,10 @@ public enum PaySyncStatusEnum { CLOSED("closed", "已关闭"), REFUND("refund", "已退款"), NOT_FOUND("not_found", "未查询到订单"), + /** 例如支付宝支付后, 客户未进行操作, 将不会创建出订单, 所以同步会返回未查询到订单 */ + IGNORE("ignore", "忽略"), + /** 本地订单到了超时时间, 但是网关和本地都未关闭, 需要触发关闭相关处理 */ + TIMEOUT("timeout", "超时未关闭"), FAIL("fail", "查询失败"); /** 编码 */ diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCommonParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCommonParam.java index c4d231e02..75b45a32f 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCommonParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCommonParam.java @@ -1,7 +1,7 @@ package cn.bootx.platform.daxpay.param.pay; import cn.bootx.platform.daxpay.serializer.TimestampToLocalDateTimeDeserializer; -import cn.bootx.platform.daxpay.util.PayUtil; +import cn.bootx.platform.daxpay.service.util.PayUtil; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java index 3f6d0a5f6..1f499612c 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayWayParam.java @@ -25,8 +25,8 @@ public class PayWayParam { /** * @see PayChannelEnum#getCode() */ - @Schema(description = "支付渠道编码") - @NotBlank(message = "支付渠道编码不可为空") + @Schema(description = "支付通道编码") + @NotBlank(message = "支付通道编码不可为空") private String channel; /** diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java index 32ea1945a..10a987d18 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java @@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; @@ -47,8 +48,8 @@ public class SimplePayParam extends PayCommonParam{ /** * @see PayChannelEnum#getCode() */ - @Schema(description = "支付渠道编码") - @NotBlank(message = "支付渠道编码不可为空") + @Schema(description = "支付通道编码") + @NotBlank(message = "支付通道编码不可为空") private String payChannel; /** @@ -60,6 +61,7 @@ public class SimplePayParam extends PayCommonParam{ @Schema(description = "支付金额") @NotNull(message = "支付金额不可为空") + @Min(1) private Integer amount; /** diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayCommonResult.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayCommonResult.java index 77d16da2c..8098c129d 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayCommonResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayCommonResult.java @@ -1,7 +1,9 @@ package cn.bootx.platform.daxpay.result.pay; +import cn.bootx.platform.common.core.code.CommonCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.slf4j.MDC; /** * 支付通用返回参数 @@ -9,11 +11,11 @@ import lombok.Data; * @since 2023/12/25 */ @Data -@Schema(title = "") +@Schema(title = "支付通用返回参数") public class PayCommonResult { @Schema(description = "请求ID") - private String reqId; + private String reqId = MDC.get(CommonCode.TRACE_ID); @Schema(description = "商户扩展参数,回调时会原样返回") private String extraParam; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayResult.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayResult.java index 57762c143..f92f75b7a 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayResult.java @@ -18,12 +18,12 @@ public class PayResult { private Long paymentId; @Schema(description = "是否是异步支付") - private boolean asyncPayMode; + private boolean asyncPay; /** * @see PayChannelEnum#ASYNC_TYPE_CODE */ - @Schema(description = "异步支付渠道") + @Schema(description = "异步支付通道") private String asyncPayChannel; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/serializer/TimestampToLocalDateTimeDeserializer.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/serializer/TimestampToLocalDateTimeDeserializer.java index d7142e00c..1633da2a7 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/serializer/TimestampToLocalDateTimeDeserializer.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/serializer/TimestampToLocalDateTimeDeserializer.java @@ -1,7 +1,7 @@ package cn.bootx.platform.daxpay.serializer; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; -import com.fasterxml.jackson.core.JacksonException; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; @@ -17,8 +17,12 @@ import java.time.LocalDateTime; public class TimestampToLocalDateTimeDeserializer extends JsonDeserializer { @Override - public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { - long timestamp = p.getLongValue(); + public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + String value = p.getValueAsString(); + if (StrUtil.isBlank(value)){ + return null; + } + long timestamp = Long.parseLong(value); return LocalDateTimeUtil.of(timestamp); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/DaxRes.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/service/util/DaxRes.java similarity index 92% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/DaxRes.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/service/util/DaxRes.java index c976ee7c2..6300e2c96 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/DaxRes.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/service/util/DaxRes.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.util; +package cn.bootx.platform.daxpay.service.util; import cn.bootx.platform.daxpay.result.DaxResult; import lombok.experimental.UtilityClass; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/service/util/PayUtil.java similarity index 96% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/service/util/PayUtil.java index d4d1b73b1..ad532dcc3 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/service/util/PayUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.util; +package cn.bootx.platform.daxpay.service.util; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.daxpay.code.PayChannelEnum; @@ -92,16 +92,16 @@ public class PayUtil { /** * 检查异步支付方式 */ - public void validationAsyncPayMode(PayParam payParam) { + public void validationAsyncPay(PayParam payParam) { // 组合支付时只允许有一个异步支付方式 List payModeList = payParam.getPayWays(); - long asyncPayModeCount = payModeList.stream() + long asyncPayCount = payModeList.stream() .map(PayWayParam::getChannel) .map(PayChannelEnum::findByCode) .filter(PayChannelEnum.ASYNC_TYPE::contains) .count(); - if (asyncPayModeCount > 1) { + if (asyncPayCount > 1) { throw new PayFailureException("组合支付时只允许有一个异步支付方式"); } } diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java index a0b695a13..f71e186e8 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java @@ -1,8 +1,8 @@ package cn.bootx.platform.daxpay.gateway.controller; import cn.bootx.platform.common.core.annotation.IgnoreAuth; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayCallbackService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayCallbackService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayCallbackService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayCallbackService; import com.ijpay.alipay.AliPayApi; import com.ijpay.core.kit.HttpKit; import com.ijpay.core.kit.WxPayKit; diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java index 8138d8ca1..3857a1c8c 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java @@ -1,17 +1,18 @@ package cn.bootx.platform.daxpay.gateway.controller; +import cn.bootx.platform.common.core.annotation.CountTime; import cn.bootx.platform.common.core.annotation.IgnoreAuth; -import cn.bootx.platform.daxpay.annotation.PaymentApi; -import cn.bootx.platform.daxpay.core.payment.close.service.PayCloseService; -import cn.bootx.platform.daxpay.core.payment.pay.service.PayService; -import cn.bootx.platform.daxpay.core.payment.refund.service.PayRefundService; -import cn.bootx.platform.daxpay.core.payment.sync.service.PaySyncService; +import cn.bootx.platform.daxpay.service.annotation.PaymentApi; +import cn.bootx.platform.daxpay.service.core.payment.close.service.PayCloseService; +import cn.bootx.platform.daxpay.service.core.payment.pay.service.PayService; +import cn.bootx.platform.daxpay.service.core.payment.refund.service.PayRefundService; +import cn.bootx.platform.daxpay.service.core.payment.sync.service.PaySyncService; import cn.bootx.platform.daxpay.param.pay.*; import cn.bootx.platform.daxpay.result.DaxResult; import cn.bootx.platform.daxpay.result.pay.PayResult; import cn.bootx.platform.daxpay.result.pay.PaySyncResult; import cn.bootx.platform.daxpay.result.pay.RefundResult; -import cn.bootx.platform.daxpay.util.DaxRes; +import cn.bootx.platform.daxpay.service.util.DaxRes; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -36,6 +37,8 @@ public class UniPayController { private final PaySyncService paySyncService; private final PayCloseService payCloseService; + + @CountTime @PaymentApi("pay") @Operation(summary = "统一下单") @PostMapping("/pay") @@ -43,6 +46,7 @@ public class UniPayController { return DaxRes.ok(payService.pay(payParam)); } + @CountTime @PaymentApi("simplePay") @Operation(summary = "简单下单") @PostMapping("/simplePay") @@ -50,6 +54,7 @@ public class UniPayController { return DaxRes.ok(payService.simplePay(payParam)); } + @CountTime @PaymentApi("close") @Operation(summary = "订单关闭") @PostMapping("/close") @@ -58,6 +63,7 @@ public class UniPayController { return DaxRes.ok(); } + @CountTime @PaymentApi("refund") @Operation(summary = "统一退款") @PostMapping("/refund") @@ -65,6 +71,7 @@ public class UniPayController { return DaxRes.ok(payRefundService.refund(param)); } + @CountTime @PaymentApi("simpleRefund") @Operation(summary = "简单退款") @PostMapping("/simpleRefund") @@ -72,13 +79,15 @@ public class UniPayController { return DaxRes.ok(payRefundService.simpleRefund(param)); } + @CountTime @PaymentApi("syncPay") @Operation(summary = "支付状态同步") @PostMapping("/syncPay") - public DaxResult syncPay(PaySyncParam param){ + public DaxResult syncPay(@RequestBody PaySyncParam param){ return DaxRes.ok(paySyncService.sync(param)); } + @CountTime @PaymentApi("syncRefund") @Operation(summary = "退款状态同步") @PostMapping("/syncRefund") diff --git a/daxpay-single/daxpay-single-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-single/daxpay-single-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a015acf4f..b5e3d5ae2 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/daxpay-single/daxpay-single-gateway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.platform.daxpay.DaxpaySingleGatewayApp +cn.bootx.platform.daxpay.gateway.DaxpaySingleGatewayApp diff --git a/daxpay-single/daxpay-single-service/pom.xml b/daxpay-single/daxpay-single-service/pom.xml index 64767ce6b..363cbabe2 100644 --- a/daxpay-single/daxpay-single-service/pom.xml +++ b/daxpay-single/daxpay-single-service/pom.xml @@ -36,7 +36,7 @@ cn.bootx - table-modify-mysql + table-modify-mysql-boot-starter ${table-modify.version} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java deleted file mode 100644 index caa550050..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.platform.daxpay.core.channel.alipay.convert; - -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; -import cn.bootx.platform.daxpay.dto.channel.alipay.AliPayConfigDto; -import cn.bootx.platform.daxpay.param.channel.alipay.AliPayConfigParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 支付宝转换 - * - * @author xxm - * @since 2021/7/5 - */ -@Mapper -public interface AlipayConvert { - - AlipayConvert CONVERT = Mappers.getMapper(AlipayConvert.class); - - AliPayConfig convert(AliPayConfigDto in); - - AliPayConfig convert(AliPayConfigParam in); - - AliPayConfigDto convert(AliPayConfig in); - -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java deleted file mode 100644 index 61377e3b1..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.convert; - -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayOrder; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherDto; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherLogDto; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherPayOrderDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author xxm - * @since 2022/3/14 - */ -@Mapper -public interface VoucherConvert { - - VoucherConvert CONVERT = Mappers.getMapper(VoucherConvert.class); - - VoucherDto convert(Voucher in); - - VoucherLogDto convert(VoucherLog in); - - VoucherPayOrderDto convert(VoucherPayOrder in); - -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java deleted file mode 100644 index ac21f3786..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.convert; - -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletConfig; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayOrder; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletConfigDto; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletDto; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletLogDto; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletPayOrderDto; -import cn.bootx.platform.daxpay.param.channel.wechat.WalletConfigParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 转换 - * - * @author xxm - * @since 2021/8/20 - */ -@Mapper -public interface WalletConvert { - - WalletConvert CONVERT = Mappers.getMapper(WalletConvert.class); - - WalletDto convert(Wallet in); - - WalletPayOrderDto convert(WalletPayOrder in); - - WalletLogDto convert(WalletLog in); - - WalletConfigDto convert(WalletConfig in); - - WalletConfig convert(WalletConfigParam in); - -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java deleted file mode 100644 index 2ee69df0a..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.convert; - -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayOrder; -import cn.bootx.platform.daxpay.dto.channel.wechat.WeChatPayConfigDto; -import cn.bootx.platform.daxpay.dto.channel.wechat.WeChatPayOrderDto; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayConfigParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 微信转换类 - * - * @author xxm - * @since 2021/6/21 - */ -@Mapper -public interface WeChatConvert { - - WeChatConvert CONVERT = Mappers.getMapper(WeChatConvert.class); - - WeChatPayConfig convert(WeChatPayConfigParam in); - - WeChatPayConfigDto convert(WeChatPayConfig in); - - WeChatPayOrderDto convert(WeChatPayOrder in); - - WeChatPayOrder convert(WeChatPayOrderDto in); - -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/convert/PayOpenApiInfoConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/convert/PayOpenApiInfoConvert.java deleted file mode 100644 index 4a14eb42b..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/convert/PayOpenApiInfoConvert.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.platform.daxpay.core.openapi.convert; - -import cn.bootx.platform.daxpay.core.openapi.entity.PayOpenApi; -import cn.bootx.platform.daxpay.param.openapi.PayOpenApiInfoParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 开放接口信息转换 - * @author xxm - * @since 2023/12/22 - */ -@Mapper -public interface PayOpenApiInfoConvert { - PayOpenApiInfoConvert CONVERT = Mappers.getMapper(PayOpenApiInfoConvert.class); - - PayOpenApi convert(PayOpenApiInfoParam in); -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/dao/PayOpenApiManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/dao/PayOpenApiManager.java deleted file mode 100644 index 49bd615b8..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/dao/PayOpenApiManager.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.bootx.platform.daxpay.core.openapi.dao; - -import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.openapi.entity.PayOpenApi; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * 支付开放接口管理 - * @author xxm - * @since 2023/12/22 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class PayOpenApiManager extends BaseManager { - - /** - * 根据code查询 - */ - public Optional findByCode(String code){ - return findByField(PayOpenApi::getCode,code); - } - - /** - * 根据api查询 - */ - public Optional findByApi(String api){ - return findByField(PayOpenApi::getApi,api); - } - -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/dao/PayOpenApiMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/dao/PayOpenApiMapper.java deleted file mode 100644 index ea1c545b9..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/dao/PayOpenApiMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.platform.daxpay.core.openapi.dao; - -import cn.bootx.platform.daxpay.core.openapi.entity.PayOpenApi; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 开放接口信息 - * @author xxm - * @since 2023/12/22 - */ -@Mapper -public interface PayOpenApiMapper extends BaseMapper { -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/service/PayOpenApiService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/service/PayOpenApiService.java deleted file mode 100644 index df34baffa..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/service/PayOpenApiService.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.bootx.platform.daxpay.core.openapi.service; - -import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.daxpay.common.context.ApiInfoLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.openapi.dao.PayOpenApiManager; -import cn.bootx.platform.daxpay.core.openapi.entity.PayOpenApi; -import cn.bootx.platform.daxpay.param.openapi.PayOpenApiInfoParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 开放接口信息 - * @author xxm - * @since 2023/12/22 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayOpenApiService { - private final PayOpenApiManager openApiInfoManager; - - /** - * 编辑 - */ - public void update(PayOpenApiInfoParam param){ - - } - - /** - * 分页 - */ - public void page(PageParam pageParam){ - - } - - /** - * 根据ID获取 - */ - public void findById(Long id){ - - } - - /** - * 初始化接口上下文信息 - */ - public void initApiInfo(PayOpenApi api){ - // 记录支付接口信息 - ApiInfoLocal apiInfoLocal = PaymentContextLocal.get().getApiInfo(); - apiInfoLocal.setApiCode(api.getCode()) - .setReqSign(api.isReqSign()) - .setResSign(api.isResSign()) - .setNotice(api.isNotice()) - .setNoticeSign(api.isNoticeSign()) - .setRecord(api.isRecord()); - } - - -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/WeChatPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/WeChatPayRepairStrategy.java deleted file mode 100644 index 29ed0912d..000000000 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/WeChatPayRepairStrategy.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.bootx.platform.daxpay.core.payment.repair.strategy; - -import cn.bootx.platform.daxpay.code.PayRepairSourceEnum; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayCloseService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayConfigService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * - * @author xxm - * @since 2023/12/29 - */ -@Slf4j -@Scope(SCOPE_PROTOTYPE) -@Service -@RequiredArgsConstructor -public class WeChatPayRepairStrategy extends AbsPayRepairStrategy { - private final WeChatPayCloseService weChatPayCloseService; - private final WeChatPayOrderService weChatPayOrderService; - - private final WeChatPayConfigService weChatPayConfigService; - - private WeChatPayConfig weChatPayConfig; - - /** - * 修复前处理 - */ - @Override - public void doBeforeHandler() { - this.weChatPayConfig = weChatPayConfigService.getConfig(); - } - - /** - * 支付成功处理 - */ - @Override - public void doSuccessHandler() { - weChatPayOrderService.updateAsyncSuccess(); - } - - /** - * 退款处理 todo 需要结合退款同步功能进行协同实现 - */ - @Override - public void doRefundHandler() { - } - - /** - * 取消支付 - */ - @Override - public void doCloseHandler() { - // 如果非同步出的订单取消状态, 则调用支付网关关闭订单 - if (this.getRepairSource() != PayRepairSourceEnum.SYNC){ - weChatPayCloseService.close(this.getOrder(),this.weChatPayConfig); - } - weChatPayOrderService.updateClose(this.getOrder().getId()); - } -} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/DaxpaySingleServiceApp.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/DaxpaySingleServiceApp.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/DaxpaySingleServiceApp.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/DaxpaySingleServiceApp.java index 8b9ded757..aa513fcd3 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/DaxpaySingleServiceApp.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/DaxpaySingleServiceApp.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay; +package cn.bootx.platform.daxpay.service; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/annotation/PaymentApi.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/annotation/PaymentApi.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/annotation/PaymentApi.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/annotation/PaymentApi.java index 2b838d176..e2b7d15df 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/annotation/PaymentApi.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/annotation/PaymentApi.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.annotation; +package cn.bootx.platform.daxpay.service.annotation; import java.lang.annotation.*; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/AliPayCode.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/AliPayCode.java similarity index 97% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/AliPayCode.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/AliPayCode.java index 39f37ff83..e2d5d7906 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/AliPayCode.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/AliPayCode.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; /** * 支付宝支付参数 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/AliPayWay.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/AliPayWay.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/AliPayWay.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/AliPayWay.java index caec9c8d3..ec1376a5c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/AliPayWay.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/AliPayWay.java @@ -1,5 +1,6 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; +import cn.bootx.platform.daxpay.code.PayWayEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import lombok.experimental.UtilityClass; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayNotifyStatusEnum.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayNotifyStatusEnum.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayNotifyStatusEnum.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayNotifyStatusEnum.java index 595c6fc58..b8998ec96 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayNotifyStatusEnum.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayNotifyStatusEnum.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayRepairSourceEnum.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairSourceEnum.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayRepairSourceEnum.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairSourceEnum.java index 1618268fc..ce290599a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayRepairSourceEnum.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairSourceEnum.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayRepairTypeEnum.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayRepairTypeEnum.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java index e9053669c..efc92a179 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayRepairTypeEnum.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayRepairTypeEnum.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; import lombok.AllArgsConstructor; import lombok.Getter; @@ -14,6 +14,7 @@ public enum PayRepairTypeEnum { SUCCESS("success","成功"), CLOSE("close","关闭"), + TIMEOUT("timeout","超时关闭"), REFUND("refund","退款"); private final String code; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayWayExtraCode.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayWayExtraCode.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayWayExtraCode.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayWayExtraCode.java index 63c8e9dd5..f19cb4724 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/PayWayExtraCode.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/PayWayExtraCode.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; /** * 支付方式扩展字段 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/VoucherCode.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/VoucherCode.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/VoucherCode.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/VoucherCode.java index b0668ed57..c56025954 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/VoucherCode.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/VoucherCode.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; /** * 储值卡常量 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WalletCode.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WalletCode.java similarity index 96% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WalletCode.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WalletCode.java index 336af7c59..16549e307 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WalletCode.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WalletCode.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; /** * 钱包涉及到的常量 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WeChatPayCode.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WeChatPayCode.java similarity index 97% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WeChatPayCode.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WeChatPayCode.java index 4b645922e..3c0d11ce5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WeChatPayCode.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WeChatPayCode.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; /** * 微信参数 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WeChatPayWay.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WeChatPayWay.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WeChatPayWay.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WeChatPayWay.java index b90f85f6f..a72e2b1a7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/code/WeChatPayWay.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/WeChatPayWay.java @@ -1,5 +1,6 @@ -package cn.bootx.platform.daxpay.code; +package cn.bootx.platform.daxpay.service.code; +import cn.bootx.platform.daxpay.code.PayWayEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import lombok.experimental.UtilityClass; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/ApiInfoLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/ApiInfoLocal.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/ApiInfoLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/ApiInfoLocal.java index 272b92ba7..75db0a13f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/ApiInfoLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/ApiInfoLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/AsyncPayLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/AsyncPayLocal.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/AsyncPayLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/AsyncPayLocal.java index 980cf36b2..ecccc21d1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/AsyncPayLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/AsyncPayLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import cn.bootx.platform.daxpay.code.PayWayEnum; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/AsyncRefundLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/AsyncRefundLocal.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/AsyncRefundLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/AsyncRefundLocal.java index bdf0a7146..add1689e6 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/AsyncRefundLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/AsyncRefundLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/NoticeLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/NoticeLocal.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/NoticeLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/NoticeLocal.java index 38a760d9a..9024e830a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/NoticeLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/NoticeLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/PaymentContext.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/PaymentContext.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/PaymentContext.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/PaymentContext.java index 775b81956..623498351 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/PaymentContext.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/PaymentContext.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import lombok.Getter; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/PlatformLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/PlatformLocal.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/PlatformLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/PlatformLocal.java index 1b7d5127d..073bfe160 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/PlatformLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/PlatformLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import cn.bootx.platform.daxpay.code.PaySignTypeEnum; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/RefundRequestLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/RefundRequestLocal.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/RefundRequestLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/RefundRequestLocal.java index a7d4b76cc..4196d21d9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/RefundRequestLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/RefundRequestLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/RequestLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/RequestLocal.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/RequestLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/RequestLocal.java index fd6ec1666..35bd8e6aa 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/context/RequestLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/context/RequestLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.context; +package cn.bootx.platform.daxpay.service.common.context; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/entity/BasePayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/entity/BasePayOrder.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/entity/BasePayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/entity/BasePayOrder.java index 489d0e02a..cd4dc572d 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/entity/BasePayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/entity/BasePayOrder.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.entity; +package cn.bootx.platform.daxpay.service.common.entity; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.table.modify.annotation.DbColumn; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/entity/OrderRefundableInfo.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/entity/OrderRefundableInfo.java similarity index 88% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/entity/OrderRefundableInfo.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/entity/OrderRefundableInfo.java index 3f0389835..fc9e06a19 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/entity/OrderRefundableInfo.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/entity/OrderRefundableInfo.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.entity; +package cn.bootx.platform.daxpay.service.common.entity; import cn.bootx.platform.daxpay.code.PayChannelEnum; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/exception/ExceptionInfo.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/exception/ExceptionInfo.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/exception/ExceptionInfo.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/exception/ExceptionInfo.java index 63639167d..9c2639e21 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/exception/ExceptionInfo.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/exception/ExceptionInfo.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.common.exception; +package cn.bootx.platform.daxpay.service.common.exception; 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/common/filter/PaymentContextLocalFilter.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/filter/PaymentContextLocalFilter.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/filter/PaymentContextLocalFilter.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/filter/PaymentContextLocalFilter.java index 66f0d608e..aa38a2fe7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/filter/PaymentContextLocalFilter.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/filter/PaymentContextLocalFilter.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.common.filter; +package cn.bootx.platform.daxpay.service.common.filter; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.core.annotation.Order; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/local/PaymentContextLocal.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/local/PaymentContextLocal.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/local/PaymentContextLocal.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/local/PaymentContextLocal.java index 90c8022ef..764434308 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/common/local/PaymentContextLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/local/PaymentContextLocal.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.common.local; +package cn.bootx.platform.daxpay.service.common.local; -import cn.bootx.platform.daxpay.common.context.PaymentContext; +import cn.bootx.platform.daxpay.service.common.context.PaymentContext; import com.alibaba.ttl.TransmittableThreadLocal; import lombok.experimental.UtilityClass; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/typehandler/RefundableInfoTypeHandler.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/typehandler/RefundableInfoTypeHandler.java new file mode 100644 index 000000000..0bfdb2b4c --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/common/typehandler/RefundableInfoTypeHandler.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.daxpay.service.common.typehandler; + +import cn.bootx.platform.common.mybatisplus.handler.JacksonTypeReferenceHandler; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import com.fasterxml.jackson.core.type.TypeReference; + +import java.util.List; + +/** + * 支付订单可退款信息对应的MP字段处理器 + * @author xxm + * @since 2024/1/3 + */ +public class RefundableInfoTypeHandler extends JacksonTypeReferenceHandler> { + + /** + * 返回要反序列化的类型对象 + */ + @Override + public TypeReference> getTypeReference() { + return new TypeReference>() {}; + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/convert/AlipayConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/convert/AlipayConvert.java new file mode 100644 index 000000000..c326f817c --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/convert/AlipayConvert.java @@ -0,0 +1,29 @@ +package cn.bootx.platform.daxpay.service.core.channel.alipay.convert; + +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayOrder; +import cn.bootx.platform.daxpay.service.dto.channel.alipay.AliPayConfigDto; +import cn.bootx.platform.daxpay.service.dto.channel.alipay.AliPaymentDto; +import cn.bootx.platform.daxpay.service.param.channel.alipay.AliPayConfigParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 支付宝转换 + * + * @author xxm + * @since 2021/7/5 + */ +@Mapper +public interface AlipayConvert { + + AlipayConvert CONVERT = Mappers.getMapper(AlipayConvert.class); + + AliPayConfig convert(AliPayConfigDto in); + + AliPayConfig convert(AliPayConfigParam in); + + AliPayConfigDto convert(AliPayConfig in); + + AliPaymentDto convert(AliPayOrder aliPayOrder); +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayConfigManager.java similarity index 70% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayConfigManager.java index 21016e4a1..eb8d6f0e9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.channel.alipay.dao; +package cn.bootx.platform.daxpay.service.core.channel.alipay.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayConfigMapper.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayConfigMapper.java index a26d1c316..2784d8dd3 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.alipay.dao; +package cn.bootx.platform.daxpay.service.core.channel.alipay.dao; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; 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/core/channel/alipay/dao/AliPayOrderManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayOrderManager.java similarity index 71% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayOrderManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayOrderManager.java index 978e2beb3..f4587c574 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayOrderManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayOrderManager.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.channel.alipay.dao; +package cn.bootx.platform.daxpay.service.core.channel.alipay.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.common.entity.BasePayOrder; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayOrder; +import cn.bootx.platform.daxpay.service.common.entity.BasePayOrder; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayOrder; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayOrderMapper.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayOrderMapper.java index b47a43154..cd9c07481 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPayOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayOrderMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.alipay.dao; +package cn.bootx.platform.daxpay.service.core.channel.alipay.dao; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayOrder; 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/core/channel/alipay/entity/AliPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java index 8bf366dd3..0118bbeab 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayConfig.java @@ -1,14 +1,13 @@ -package cn.bootx.platform.daxpay.core.channel.alipay.entity; +package cn.bootx.platform.daxpay.service.core.channel.alipay.entity; import cn.bootx.platform.common.core.annotation.BigField; import cn.bootx.platform.common.core.annotation.EncryptionField; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.common.mybatisplus.handler.StringListTypeHandler; -import cn.bootx.platform.daxpay.code.AliPayCode; -import cn.bootx.platform.daxpay.core.channel.alipay.convert.AlipayConvert; -import cn.bootx.platform.daxpay.dto.channel.alipay.AliPayConfigDto; -import cn.bootx.platform.daxpay.param.channel.alipay.AliPayConfigParam; +import cn.bootx.platform.daxpay.service.code.AliPayCode; +import cn.bootx.platform.daxpay.service.core.channel.alipay.convert.AlipayConvert; +import cn.bootx.platform.daxpay.service.dto.channel.alipay.AliPayConfigDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; @@ -31,7 +30,7 @@ import java.util.List; @Data @Accessors(chain = true) @DbTable(comment = "支付宝支付配置") -@TableName("pay_alipay_config") +@TableName(value = "pay_alipay_config",autoResultMap = true) public class AliPayConfig extends MpBaseEntity implements EntityBaseFunction { /** 支付宝商户appId */ @@ -43,7 +42,7 @@ public class AliPayConfig extends MpBaseEntity implements EntityBaseFunction payWays; @@ -113,8 +113,4 @@ public class AliPayConfig extends MpBaseEntity implements EntityBaseFunction { @@ -29,9 +31,7 @@ public class AliPayOrder extends BasePayOrder implements EntityBaseFunction { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayOrder.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayOrder.java index 906c7f71b..ca2532f37 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayOrder.java @@ -1,6 +1,7 @@ -package cn.bootx.platform.daxpay.core.channel.union.entity; +package cn.bootx.platform.daxpay.service.core.channel.union.entity; -import cn.bootx.platform.daxpay.common.entity.BasePayOrder; +import cn.bootx.platform.daxpay.service.common.entity.BasePayOrder; +import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,6 +14,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "云闪付支付订单") @Accessors(chain = true) @TableName("pay_union_payment") public class UnionPayOrder extends BasePayOrder { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayConfigService.java similarity index 66% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayConfigService.java index 27d60b821..635708384 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayConfigService.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.union.service; +package cn.bootx.platform.daxpay.service.core.channel.union.service; -import cn.bootx.platform.daxpay.core.channel.union.dao.UnionPayConfigManager; +import cn.bootx.platform.daxpay.service.core.channel.union.dao.UnionPayConfigManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java index 12b11f15a..1c2183240 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.channel.union.service; +package cn.bootx.platform.daxpay.service.core.channel.union.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPaymentService.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPaymentService.java index 0305898f7..28640054b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPaymentService.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.channel.union.service; +package cn.bootx.platform.daxpay.service.core.channel.union.service; 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/channel/voucher/convert/VoucherConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/convert/VoucherConvert.java new file mode 100644 index 000000000..27082e4f1 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/convert/VoucherConvert.java @@ -0,0 +1,27 @@ +package cn.bootx.platform.daxpay.service.core.channel.voucher.convert; + +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherLog; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherPayOrder; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherDto; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherLogDto; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherPayOrderDto; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * @author xxm + * @since 2022/3/14 + */ +@Mapper +public interface VoucherConvert { + + VoucherConvert CONVERT = Mappers.getMapper(VoucherConvert.class); + + VoucherDto convert(Voucher in); + + VoucherLogDto convert(VoucherLog in); + + VoucherPayOrderDto convert(VoucherPayOrder in); + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherLogManager.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherLogManager.java index 927c120de..b67354543 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherLogManager.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.dao; +package cn.bootx.platform.daxpay.service.core.channel.voucher.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherLog; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherLogMapper.java similarity index 60% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherLogMapper.java index 7c89a04c7..d8c03c2c1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherLogMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.dao; +package cn.bootx.platform.daxpay.service.core.channel.voucher.dao; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherLog; 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/core/channel/voucher/dao/VoucherManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherManager.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherManager.java index 824528392..eda98b9e7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherManager.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.dao; +package cn.bootx.platform.daxpay.service.core.channel.voucher.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; -import cn.bootx.platform.daxpay.param.channel.voucher.VoucherParam; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.param.channel.voucher.VoucherParam; import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherMapper.java similarity index 60% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherMapper.java index 63e52bc73..ec53e8df0 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.dao; +package cn.bootx.platform.daxpay.service.core.channel.voucher.dao; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; 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/core/channel/voucher/dao/VoucherPayOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherPayOrderMapper.java similarity index 60% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPayOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherPayOrderMapper.java index 4e7c1fc66..a3362b339 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPayOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherPayOrderMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.dao; +package cn.bootx.platform.daxpay.service.core.channel.voucher.dao; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherPayOrder; 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/core/channel/voucher/dao/VoucherPaymentManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherPaymentManager.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherPaymentManager.java index db60238fe..f2d26da89 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/dao/VoucherPaymentManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.dao; +package cn.bootx.platform.daxpay.service.core.channel.voucher.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherPayOrder; 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/core/channel/voucher/entity/Voucher.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/Voucher.java similarity index 88% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/Voucher.java index 686b093a3..6937a5836 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/Voucher.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.entity; +package cn.bootx.platform.daxpay.service.core.channel.voucher.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.code.VoucherCode; -import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherDto; +import cn.bootx.platform.daxpay.service.code.VoucherCode; +import cn.bootx.platform.daxpay.service.core.channel.voucher.convert.VoucherConvert; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbComment; import cn.bootx.table.modify.annotation.DbTable; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherLog.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherLog.java index 220d67417..c2ce78cc2 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherLog.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.entity; +package cn.bootx.platform.daxpay.service.core.channel.voucher.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.code.VoucherCode; -import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherLogDto; +import cn.bootx.platform.daxpay.service.code.VoucherCode; +import cn.bootx.platform.daxpay.service.core.channel.voucher.convert.VoucherConvert; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherLogDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherPayOrder.java similarity index 65% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherPayOrder.java index 094b60ca1..1fa249653 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherPayOrder.java @@ -1,14 +1,16 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.entity; +package cn.bootx.platform.daxpay.service.core.channel.voucher.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; -import cn.bootx.platform.daxpay.common.entity.BasePayOrder; -import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherPayOrderDto; +import cn.bootx.platform.daxpay.service.common.entity.BasePayOrder; +import cn.bootx.platform.daxpay.service.core.channel.voucher.convert.VoucherConvert; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherPayOrderDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -28,7 +30,8 @@ public class VoucherPayOrder extends BasePayOrder implements EntityBaseFunction< /** 扣款储值卡 */ @DbColumn(comment = "扣款储值卡") - @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) + @DbMySqlFieldType(MySqlFieldTypeEnum.JSON) + @TableField(typeHandler = JacksonTypeHandler.class) private VoucherRecord voucherRecord; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java similarity index 80% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherRecord.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java index dba9aa1bd..f60aff320 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.entity; +package cn.bootx.platform.daxpay.service.core.channel.voucher.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherLogService.java similarity index 76% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherLogService.java index 378b8bea5..c662ee57d 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherLogService.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.service; +package cn.bootx.platform.daxpay.service.core.channel.voucher.service; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherLogManager; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherLogDto; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherLogManager; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherLogDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherPayOrderService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayOrderService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherPayOrderService.java index 1aadb3da0..eb23822ba 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherPayOrderService.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.service; +package cn.bootx.platform.daxpay.service.core.channel.voucher.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherPaymentManager; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayOrder; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherRecord; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherPaymentManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherRecord; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherPayService.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherPayService.java index 38732a287..e039cd6d4 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherPayService.java @@ -1,14 +1,14 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.service; +package cn.bootx.platform.daxpay.service.core.channel.voucher.service; -import cn.bootx.platform.daxpay.code.VoucherCode; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherLogManager; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherManager; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherPaymentManager; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayOrder; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherRecord; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.code.VoucherCode; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherLogManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherPaymentManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherLog; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherRecord; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.channel.VoucherPayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherQueryService.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherQueryService.java index 4136fce1a..dcb2b8f78 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherQueryService.java @@ -1,14 +1,14 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.service; +package cn.bootx.platform.daxpay.service.core.channel.voucher.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherManager; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; -import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherDto; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.dto.channel.voucher.VoucherDto; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.channel.voucher.VoucherParam; +import cn.bootx.platform.daxpay.service.param.channel.voucher.VoucherParam; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherService.java index c4a8ccb4a..350f3ea8a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherService.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.voucher.service; +package cn.bootx.platform.daxpay.service.core.channel.voucher.service; import cn.bootx.platform.common.core.exception.BizException; -import cn.bootx.platform.daxpay.code.VoucherCode; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherLogManager; -import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherManager; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; -import cn.bootx.platform.daxpay.param.channel.voucher.VoucherImportParam; +import cn.bootx.platform.daxpay.service.code.VoucherCode; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherLogManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.dao.VoucherManager; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.param.channel.voucher.VoucherImportParam; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java new file mode 100644 index 000000000..2dc11bb60 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java @@ -0,0 +1,36 @@ +package cn.bootx.platform.daxpay.service.core.channel.wallet.convert; + +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletConfig; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletLog; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletPayOrder; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletConfigDto; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletDto; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletLogDto; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletPayOrderDto; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WalletConfigParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 转换 + * + * @author xxm + * @since 2021/8/20 + */ +@Mapper +public interface WalletConvert { + + WalletConvert CONVERT = Mappers.getMapper(WalletConvert.class); + + WalletDto convert(Wallet in); + + WalletPayOrderDto convert(WalletPayOrder in); + + WalletLogDto convert(WalletLog in); + + WalletConfigDto convert(WalletConfig in); + + WalletConfig convert(WalletConfigParam in); + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletConfigManager.java similarity index 78% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletConfigManager.java index 1867aeaae..e254d3dc6 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletConfig; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletConfig; 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/core/channel/wallet/dao/WalletConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletConfigMapper.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletConfigMapper.java index 27ada2c28..9e3616858 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletConfig; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletConfig; 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/core/channel/wallet/dao/WalletLogManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletLogManager.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletLogManager.java index 53f28e5f9..2040f9716 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletLogManager.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletLogQueryParam; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletLog; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletLogQueryParam; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletLogMapper.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletLogMapper.java index 9fabe6ede..9dd381013 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletLogMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletLog; 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/core/channel/wallet/dao/WalletManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletManager.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletManager.java index 5ef95e8d9..a9b1cac1e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletManager.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.common.query.generator.QueryGenerator; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletQueryParam; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletQueryParam; import cn.bootx.platform.starter.auth.util.SecurityUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletMapper.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletMapper.java index 5d8a7112f..9442cd3e5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletPaymentManager.java similarity index 67% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletPaymentManager.java index 67bb608c9..544a689a9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletPaymentManager.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.common.entity.BasePayOrder; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayOrder; +import cn.bootx.platform.daxpay.service.common.entity.BasePayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletPayOrder; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletPaymentMapper.java similarity index 55% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletPaymentMapper.java index 6ef2507d6..5a5a3d58a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/dao/WalletPaymentMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.dao; +package cn.bootx.platform.daxpay.service.core.channel.wallet.dao; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletPayOrder; 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/core/channel/wallet/entity/Wallet.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/Wallet.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/Wallet.java index 94a2ded5f..a2636e998 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/Wallet.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.entity; +package cn.bootx.platform.daxpay.service.core.channel.wallet.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.code.WalletCode; -import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletDto; +import cn.bootx.platform.daxpay.service.code.WalletCode; +import cn.bootx.platform.daxpay.service.core.channel.wallet.convert.WalletConvert; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletDto; 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/core/channel/wallet/entity/WalletConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletConfig.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletConfig.java index 971fc3d1a..08b23db15 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletConfig.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.entity; +package cn.bootx.platform.daxpay.service.core.channel.wallet.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletConfigDto; -import cn.bootx.platform.daxpay.param.channel.wechat.WalletConfigParam; +import cn.bootx.platform.daxpay.service.core.channel.wallet.convert.WalletConvert; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletConfigDto; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WalletConfigParam; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletLog.java similarity index 82% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletLog.java index 7558ebfe4..25992418f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletLog.java @@ -1,11 +1,12 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.entity; +package cn.bootx.platform.daxpay.service.core.channel.wallet.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletLogDto; +import cn.bootx.platform.daxpay.service.core.channel.wallet.convert.WalletConvert; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletLogDto; import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -20,7 +21,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data -//@DbTable(comment = "钱包日志") +@DbTable(comment = "钱包日志") @Accessors(chain = true) @TableName("pay_wallet_log") public class WalletLog extends MpBaseEntity implements EntityBaseFunction { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletPayOrder.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletPayOrder.java index 3e1ceb0d3..0cdbcc4bd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletPayOrder.java @@ -1,9 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.entity; +package cn.bootx.platform.daxpay.service.core.channel.wallet.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; -import cn.bootx.platform.daxpay.common.entity.BasePayOrder; -import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletPayOrderDto; +import cn.bootx.platform.daxpay.service.common.entity.BasePayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wallet.convert.WalletConvert; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletPayOrderDto; +import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +18,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data -//@DbTable(comment = "钱包交易记录") +@DbTable(comment = "钱包交易记录") @Accessors(chain = true) @TableName("pay_wallet_pay_order") public class WalletPayOrder extends BasePayOrder implements EntityBaseFunction { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletConfigService.java similarity index 76% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletConfigService.java index 5e9f1a487..7f0c08020 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletConfigService.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.service; +package cn.bootx.platform.daxpay.service.core.channel.wallet.service; import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletConfigManager; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletConfig; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletConfigDto; -import cn.bootx.platform.daxpay.param.channel.wechat.WalletConfigParam; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletConfigManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletConfig; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletConfigDto; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WalletConfigParam; 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/core/channel/wallet/service/WalletLogService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletLogService.java similarity index 81% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletLogService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletLogService.java index f813aa8e1..fb9e2d9ab 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletLogService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletLogService.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.service; +package cn.bootx.platform.daxpay.service.core.channel.wallet.service; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletLogManager; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletLogDto; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletLogQueryParam; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletLogManager; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletLogDto; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletLogQueryParam; import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletPayOrderService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayOrderService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletPayOrderService.java index 9399704a1..a08a466c8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletPayOrderService.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.service; +package cn.bootx.platform.daxpay.service.core.channel.wallet.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletPaymentManager; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayOrder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletPaymentManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletPayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletPayService.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletPayService.java index b2f23a586..63f6d95ce 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletPayService.java @@ -1,15 +1,15 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.service; +package cn.bootx.platform.daxpay.service.core.channel.wallet.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.code.WalletCode; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletLogManager; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletPaymentManager; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayOrder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.code.WalletCode; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletLogManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletPaymentManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletLog; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletPayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.exception.waller.WalletLackOfBalanceException; import cn.bootx.platform.daxpay.exception.waller.WalletNotExistsException; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletQueryService.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletQueryService.java index 38701352e..a79dadaec 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletQueryService.java @@ -1,15 +1,15 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.service; +package cn.bootx.platform.daxpay.service.core.channel.wallet.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletDto; -import cn.bootx.platform.daxpay.dto.channel.wallet.WalletInfoDto; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletPayParam; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletQueryParam; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletDto; +import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletInfoDto; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletPayParam; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletQueryParam; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletService.java index 505caf246..6e15f784f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletService.java @@ -1,14 +1,14 @@ -package cn.bootx.platform.daxpay.core.channel.wallet.service; +package cn.bootx.platform.daxpay.service.core.channel.wallet.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.daxpay.code.WalletCode; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletConfigManager; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletLogManager; -import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletRechargeParam; +import cn.bootx.platform.daxpay.service.code.WalletCode; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletConfigManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletLogManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletManager; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletLog; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletRechargeParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/convert/WeChatConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/convert/WeChatConvert.java new file mode 100644 index 000000000..572f83665 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/convert/WeChatConvert.java @@ -0,0 +1,30 @@ +package cn.bootx.platform.daxpay.service.core.channel.wechat.convert; + +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayOrder; +import cn.bootx.platform.daxpay.service.dto.channel.wechat.WeChatPayConfigDto; +import cn.bootx.platform.daxpay.service.dto.channel.wechat.WeChatPayOrderDto; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayConfigParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 微信转换类 + * + * @author xxm + * @since 2021/6/21 + */ +@Mapper +public interface WeChatConvert { + + WeChatConvert CONVERT = Mappers.getMapper(WeChatConvert.class); + + WeChatPayConfig convert(WeChatPayConfigParam in); + + WeChatPayConfigDto convert(WeChatPayConfig in); + + WeChatPayOrderDto convert(WeChatPayOrder in); + + WeChatPayOrder convert(WeChatPayOrderDto in); + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayConfigManager.java similarity index 82% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayConfigManager.java index a25580fe2..a2f6a5bae 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayConfigManager.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.dao; +package cn.bootx.platform.daxpay.service.core.channel.wechat.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.common.query.generator.QueryGenerator; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayConfigParam; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayConfigParam; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayConfigMapper.java similarity index 63% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayConfigMapper.java index fb61adec3..987802dd7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.dao; +package cn.bootx.platform.daxpay.service.core.channel.wechat.dao; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; 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/core/channel/wechat/dao/WeChatPayOrderManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayOrderManager.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayOrderManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayOrderManager.java index 3edd2e93c..7782ea41a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayOrderManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayOrderManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.dao; +package cn.bootx.platform.daxpay.service.core.channel.wechat.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayOrder; 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/core/channel/wechat/dao/WeChatPayOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayOrderMapper.java similarity index 55% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayOrderMapper.java index 67f4272d5..6ccb86634 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/dao/WeChatPayOrderMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.dao; +package cn.bootx.platform.daxpay.service.core.channel.wechat.dao; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayOrder; 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/core/channel/wechat/entity/WeChatPayConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayConfig.java similarity index 88% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayConfig.java index 7be5865c6..05f70c890 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayConfig.java @@ -1,14 +1,14 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.entity; +package cn.bootx.platform.daxpay.service.core.channel.wechat.entity; import cn.bootx.platform.common.core.annotation.BigField; import cn.bootx.platform.common.core.annotation.EncryptionField; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.common.mybatisplus.handler.StringListTypeHandler; -import cn.bootx.platform.daxpay.code.WeChatPayCode; -import cn.bootx.platform.daxpay.core.channel.wechat.convert.WeChatConvert; -import cn.bootx.platform.daxpay.dto.channel.wechat.WeChatPayConfigDto; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayConfigParam; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.core.channel.wechat.convert.WeChatConvert; +import cn.bootx.platform.daxpay.service.dto.channel.wechat.WeChatPayConfigDto; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayConfigParam; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; @@ -33,7 +33,7 @@ import java.util.List; @Data @DbTable(comment = "微信支付配置") @Accessors(chain = true) -@TableName("pay_wechat_pay_config") +@TableName(value = "pay_wechat_pay_config",autoResultMap = true) public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction { /** 名称 */ @@ -112,6 +112,7 @@ public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction< /** 可用支付方式 */ @DbColumn(comment = "可用支付方式") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) @TableField(typeHandler = StringListTypeHandler.class) private List payWays; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayOrder.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayOrder.java index 4b4bc9b9e..d8471feaa 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayOrder.java @@ -1,9 +1,10 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.entity; +package cn.bootx.platform.daxpay.service.core.channel.wechat.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; -import cn.bootx.platform.daxpay.common.entity.BasePayOrder; -import cn.bootx.platform.daxpay.core.channel.wechat.convert.WeChatConvert; -import cn.bootx.platform.daxpay.dto.channel.wechat.WeChatPayOrderDto; +import cn.bootx.platform.daxpay.service.common.entity.BasePayOrder; +import cn.bootx.platform.daxpay.service.core.channel.wechat.convert.WeChatConvert; +import cn.bootx.platform.daxpay.service.dto.channel.wechat.WeChatPayOrderDto; +import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,6 +16,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "微信支付记录") @Accessors(chain = true) @TableName("pay_wechat_payment") public class WeChatPayOrder extends BasePayOrder implements EntityBaseFunction { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCallbackService.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCallbackService.java index 38c937789..696417180 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCallbackService.java @@ -1,14 +1,14 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; import cn.bootx.platform.common.redis.RedisClient; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.code.WeChatPayCode; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.record.callback.dao.CallbackRecordManager; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.payment.callback.service.PayCallbackService; -import cn.bootx.platform.daxpay.func.AbsPayCallbackStrategy; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.record.callback.dao.CallbackRecordManager; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.payment.callback.service.PayCallbackService; +import cn.bootx.platform.daxpay.service.func.AbsPayCallbackStrategy; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.ijpay.core.enums.SignType; @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static cn.bootx.platform.daxpay.code.WeChatPayCode.APPID; +import static cn.bootx.platform.daxpay.service.code.WeChatPayCode.APPID; /** diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCloseService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCloseService.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCloseService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCloseService.java index 7392581d3..2236975dd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCloseService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCloseService.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; import cn.bootx.platform.common.spring.exception.RetryableException; -import cn.bootx.platform.daxpay.code.WeChatPayCode; -import cn.bootx.platform.daxpay.common.context.AsyncRefundLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.common.context.AsyncRefundLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.hutool.core.util.StrUtil; import com.ijpay.core.enums.SignType; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayConfigService.java similarity index 82% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayConfigService.java index ef3ff8cf6..6988f7225 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayConfigService.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.dto.LabelValue; -import cn.bootx.platform.daxpay.code.WeChatPayWay; -import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayConfigManager; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.code.WeChatPayWay; +import cn.bootx.platform.daxpay.service.core.channel.wechat.dao.WeChatPayConfigManager; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayConfigParam; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayConfigParam; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayOrderService.java similarity index 78% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayOrderService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayOrderService.java index e428d23e6..92708d81f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayOrderService.java @@ -1,16 +1,15 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; -import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.context.AsyncPayLocal; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayOrderManager; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayOrder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderChannelService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.common.context.AsyncPayLocal; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.channel.wechat.dao.WeChatPayOrderManager; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderChannelService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -43,7 +42,7 @@ public class WeChatPayOrderService { */ public void updatePaySuccess(PayOrder payOrder, PayWayParam payWayParam) { AsyncPayLocal asyncPayInfo = PaymentContextLocal.get().getAsyncPayInfo();; - payOrder.setAsyncPay(true).setAsyncPayChannel(PayChannelEnum.WECHAT.getCode()); + payOrder.setAsyncPay(true).setAsyncChannel(PayChannelEnum.WECHAT.getCode()); payOrderChannelService.updateChannel(payWayParam,payOrder); @@ -64,9 +63,8 @@ public class WeChatPayOrderService { /** * 异步支付成功, 更新支付记录成功状态, 并创建微信支付记录 */ - public void updateAsyncSuccess(Long id, PayWayParam payWayParam) { - PayOrder payOrder = payOrderService.findById(id).orElseThrow(() -> new BizException("支付记录不存在")); - this.createWeChatOrder(payOrder, payWayParam.getAmount()); + public void updateAsyncSuccess(PayOrder payOrder, int amount) { + this.createWeChatOrder(payOrder, amount); } /** diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java index 6de7d934b..e3ee34c6a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; import cn.bootx.platform.common.core.util.CollUtil; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; @@ -6,18 +6,18 @@ import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.common.spring.exception.RetryableException; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.PayWayEnum; -import cn.bootx.platform.daxpay.code.WeChatPayCode; -import cn.bootx.platform.daxpay.code.WeChatPayWay; -import cn.bootx.platform.daxpay.common.context.AsyncPayLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.payment.sync.service.PaySyncService; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.code.WeChatPayWay; +import cn.bootx.platform.daxpay.service.common.context.AsyncPayLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.payment.sync.service.PaySyncService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayParam; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.bootx.platform.daxpay.result.pay.PaySyncResult; -import cn.bootx.platform.daxpay.util.PayUtil; +import cn.bootx.platform.daxpay.service.util.PayUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPaySyncService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPaySyncService.java index fdd962269..08d168f65 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPaySyncService.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; -import cn.bootx.platform.daxpay.code.WeChatPayCode; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.payment.sync.result.GatewaySyncResult; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.payment.sync.result.GatewaySyncResult; import cn.hutool.json.JSONUtil; import com.ijpay.core.enums.SignType; import com.ijpay.core.kit.WxPayKit; @@ -31,7 +31,7 @@ public class WeChatPaySyncService { * 同步查询 */ public GatewaySyncResult syncPayStatus(Long paymentId, WeChatPayConfig weChatPayConfig) { - GatewaySyncResult syncResult = new GatewaySyncResult().setSyncStatus(PaySyncStatusEnum.FAIL.getCode()); + GatewaySyncResult syncResult = new GatewaySyncResult().setSyncStatus(PaySyncStatusEnum.FAIL); Map params = UnifiedOrderModel.builder() .appid(weChatPayConfig.getWxAppId()) .mch_id(weChatPayConfig.getWxMchId()) @@ -52,29 +52,29 @@ public class WeChatPaySyncService { // 未查到订单 if (!WxPayKit.codeIsOk(result.get(WeChatPayCode.RESULT_CODE))) { log.warn("疑似未查询到订单:{}", result); - return syncResult.setSyncStatus(PaySyncStatusEnum.NOT_FOUND.getCode()); + return syncResult.setSyncStatus(PaySyncStatusEnum.NOT_FOUND); } String tradeStatus = result.get(WeChatPayCode.TRADE_STATE); // 支付完成 if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_SUCCESS) || Objects.equals(tradeStatus, WeChatPayCode.TRADE_ACCEPT)) { - return syncResult.setSyncStatus(PaySyncStatusEnum.PAY_SUCCESS.getCode()); + return syncResult.setSyncStatus(PaySyncStatusEnum.PAY_SUCCESS); } // 待支付 if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_NOTPAY) || Objects.equals(tradeStatus, WeChatPayCode.TRADE_USERPAYING)) { - return syncResult.setSyncStatus(PaySyncStatusEnum.PAY_WAIT.getCode()); + return syncResult.setSyncStatus(PaySyncStatusEnum.PAY_WAIT); } // 已退款/退款中 if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_REFUND)) { - return syncResult.setSyncStatus(PaySyncStatusEnum.REFUND.getCode()); + return syncResult.setSyncStatus(PaySyncStatusEnum.REFUND); } // 已关闭 if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_CLOSED) || Objects.equals(tradeStatus, WeChatPayCode.TRADE_REVOKED) || Objects.equals(tradeStatus, WeChatPayCode.TRADE_PAYERROR)) { - return syncResult.setSyncStatus(PaySyncStatusEnum.CLOSED.getCode()); + return syncResult.setSyncStatus(PaySyncStatusEnum.CLOSED); } } catch (RuntimeException e) { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WechatRefundService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WechatRefundService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WechatRefundService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WechatRefundService.java index 005e6b47c..dd3d3a105 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WechatRefundService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WechatRefundService.java @@ -1,13 +1,13 @@ -package cn.bootx.platform.daxpay.core.channel.wechat.service; +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayRefundStatusEnum; -import cn.bootx.platform.daxpay.code.WeChatPayCode; -import cn.bootx.platform.daxpay.common.context.AsyncRefundLocal; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.common.context.AsyncRefundLocal; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.IdUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/callback/result/PayCallbackResult.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/callback/result/PayCallbackResult.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java index 2cd7be82e..82c4fa344 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/callback/result/PayCallbackResult.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/result/PayCallbackResult.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.payment.callback.result; +package cn.bootx.platform.daxpay.service.core.payment.callback.result; import cn.bootx.platform.daxpay.code.PayStatusEnum; import lombok.Data; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/callback/service/PayCallbackService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/callback/service/PayCallbackService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java index 126a1937f..545e0ace1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/callback/service/PayCallbackService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/callback/service/PayCallbackService.java @@ -1,15 +1,15 @@ -package cn.bootx.platform.daxpay.core.payment.callback.service; +package cn.bootx.platform.daxpay.service.core.payment.callback.service; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; -import cn.bootx.platform.daxpay.code.PayNotifyStatusEnum; -import cn.bootx.platform.daxpay.code.PayRepairSourceEnum; -import cn.bootx.platform.daxpay.code.PayRepairTypeEnum; +import cn.bootx.platform.daxpay.service.code.PayNotifyStatusEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairTypeEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.core.payment.callback.result.PayCallbackResult; -import cn.bootx.platform.daxpay.core.payment.repair.param.PayRepairParam; -import cn.bootx.platform.daxpay.core.payment.repair.service.PayRepairService; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.core.payment.callback.result.PayCallbackResult; +import cn.bootx.platform.daxpay.service.core.payment.repair.param.PayRepairParam; +import cn.bootx.platform.daxpay.service.core.payment.repair.service.PayRepairService; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/factory/PayCloseStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/factory/PayCloseStrategyFactory.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/factory/PayCloseStrategyFactory.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/factory/PayCloseStrategyFactory.java index e1672540c..a458e32c5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/factory/PayCloseStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/factory/PayCloseStrategyFactory.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.core.payment.close.factory; +package cn.bootx.platform.daxpay.service.core.payment.close.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.payment.close.strategy.*; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.core.payment.close.strategy.*; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.experimental.UtilityClass; @@ -26,7 +26,7 @@ import static cn.bootx.platform.daxpay.code.PayChannelEnum.ASYNC_TYPE_CODE; public class PayCloseStrategyFactory { /** - * 根据传入的支付渠道创建策略 + * 根据传入的支付通道创建策略 * @return 支付策略 */ public static AbsPayCloseStrategy create(PayChannelEnum channelEnum) { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/service/PayCloseService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/service/PayCloseService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java index 0d52d8177..71194a8be 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/service/PayCloseService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java @@ -1,13 +1,13 @@ -package cn.bootx.platform.daxpay.core.payment.close.service; +package cn.bootx.platform.daxpay.service.core.payment.close.service; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.payment.close.factory.PayCloseStrategyFactory; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.payment.close.factory.PayCloseStrategyFactory; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import cn.bootx.platform.daxpay.param.pay.PayCloseParam; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/AliPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/AliPayCloseStrategy.java similarity index 68% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/AliPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/AliPayCloseStrategy.java index 5744515e5..02fd261ec 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/AliPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/AliPayCloseStrategy.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.close.strategy; +package cn.bootx.platform.daxpay.service.core.payment.close.strategy; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayCloseService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayOrderService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayConfigService; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayCloseService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/CashPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java similarity index 74% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/CashPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java index ab346a9dd..224d963a8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/CashPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.payment.close.strategy; +package cn.bootx.platform.daxpay.service.core.payment.close.strategy; -import cn.bootx.platform.daxpay.core.channel.cash.service.CashService; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.core.channel.cash.service.CashService; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/UnionPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/UnionPayCloseStrategy.java similarity index 80% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/UnionPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/UnionPayCloseStrategy.java index 421b13a21..07a636f2f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/UnionPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/UnionPayCloseStrategy.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.payment.close.strategy; +package cn.bootx.platform.daxpay.service.core.payment.close.strategy; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/VoucherPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java similarity index 71% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/VoucherPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java index c1c6825ae..18de6e272 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/VoucherPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.payment.close.strategy; +package cn.bootx.platform.daxpay.service.core.payment.close.strategy; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayOrderService; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayService; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayService; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/WalletPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java similarity index 71% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/WalletPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java index 471138502..ade319940 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/WalletPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.payment.close.strategy; +package cn.bootx.platform.daxpay.service.core.payment.close.strategy; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayOrderService; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayService; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayService; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/WeChatPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WeChatPayCloseStrategy.java similarity index 70% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/WeChatPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WeChatPayCloseStrategy.java index 538bb97a8..d2a11f4a7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/close/strategy/WeChatPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WeChatPayCloseStrategy.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.close.strategy; +package cn.bootx.platform.daxpay.service.core.payment.close.strategy; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayCloseService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayConfigService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayCloseStrategy; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayCloseService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/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 similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/common/aop/PaymentVerifySignAop.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/aop/PaymentVerifySignAop.java index 7ac878b9f..c6dc78a5e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/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 @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.payment.common.aop; +package cn.bootx.platform.daxpay.service.core.payment.common.aop; import cn.bootx.platform.common.core.util.ValidationUtil; -import cn.bootx.platform.daxpay.annotation.PaymentApi; -import cn.bootx.platform.daxpay.core.payment.common.service.PaymentSignService; +import cn.bootx.platform.daxpay.service.annotation.PaymentApi; +import cn.bootx.platform.daxpay.service.core.payment.common.service.PaymentSignService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.pay.PayCommonParam; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/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 similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/common/service/PaymentAssistService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentAssistService.java index 481cca1c0..d0d11edf8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/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 @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.payment.common.service; +package cn.bootx.platform.daxpay.service.core.payment.common.service; import cn.bootx.platform.common.core.code.CommonCode; -import cn.bootx.platform.daxpay.common.context.PlatformLocal; -import cn.bootx.platform.daxpay.common.context.RequestLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.system.entity.PlatformConfig; -import cn.bootx.platform.daxpay.core.system.service.PlatformConfigService; +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.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/core/payment/common/service/PaymentSignService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentSignService.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/common/service/PaymentSignService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentSignService.java index 33d3246bb..b7d7ec05b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/common/service/PaymentSignService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/common/service/PaymentSignService.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.core.payment.common.service; +package cn.bootx.platform.daxpay.service.core.payment.common.service; import cn.bootx.platform.daxpay.code.PaySignTypeEnum; -import cn.bootx.platform.daxpay.common.context.ApiInfoLocal; -import cn.bootx.platform.daxpay.common.context.PlatformLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.common.context.ApiInfoLocal; +import cn.bootx.platform.daxpay.service.common.context.PlatformLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.pay.PayCommonParam; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/factory/PayStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/factory/PayStrategyFactory.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java index 90d4b2f35..f96c91a55 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/factory/PayStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.pay.factory; +package cn.bootx.platform.daxpay.service.core.payment.pay.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.payment.pay.strategy.*; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; import cn.bootx.platform.daxpay.param.pay.PayWayParam; +import cn.bootx.platform.daxpay.service.core.payment.pay.strategy.*; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.experimental.UtilityClass; @@ -28,7 +28,7 @@ import static cn.bootx.platform.daxpay.code.PayChannelEnum.ASYNC_TYPE_CODE; public class PayStrategyFactory { /** - * 根据传入的支付渠道创建策略 + * 根据传入的支付通道创建策略 * @param payWayParam 支付类型 * @return 支付策略 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/service/PayAssistService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/service/PayAssistService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java index 33f20601d..cf07fb91c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/service/PayAssistService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java @@ -1,24 +1,24 @@ -package cn.bootx.platform.daxpay.core.payment.pay.service; +package cn.bootx.platform.daxpay.service.core.payment.pay.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.context.AsyncPayLocal; -import cn.bootx.platform.daxpay.common.context.NoticeLocal; -import cn.bootx.platform.daxpay.common.context.PlatformLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.record.pay.builder.PaymentBuilder; -import cn.bootx.platform.daxpay.core.record.pay.dao.PayOrderChannelManager; -import cn.bootx.platform.daxpay.core.record.pay.dao.PayOrderExtraManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderChannel; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderExtra; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.common.context.AsyncPayLocal; +import cn.bootx.platform.daxpay.service.common.context.NoticeLocal; +import cn.bootx.platform.daxpay.service.common.context.PlatformLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.record.pay.builder.PaymentBuilder; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderChannelManager; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderExtraManager; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderExtra; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; -import cn.bootx.platform.daxpay.util.PayUtil; +import cn.bootx.platform.daxpay.service.util.PayUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -108,7 +108,7 @@ public class PayAssistService { */ public PayWayParam getAsyncPayParam(PayParam payParam, PayOrder payOrder) { // 查询之前的支付方式 - String asyncPayChannel = payOrder.getAsyncPayChannel(); + String asyncPayChannel = payOrder.getAsyncChannel(); PayOrderChannel payOrderChannel = payOrderChannelManager.findByPaymentIdAndChannel(payOrder.getId(), asyncPayChannel) .orElseThrow(() -> new PayFailureException("支付方式数据异常")); @@ -138,7 +138,7 @@ public class PayAssistService { // 构建支付通道表并保存 List payOrderChannels = PaymentBuilder.buildPayChannel(payParam.getPayWays()) .stream() - .peek(o -> o.setPaymentId(payOrder.getId())) + .peek(o -> o.setPaymentId(payOrder.getId()).setAsync(payOrder.isAsyncPay())) .collect(Collectors.toList()); payOrderChannelManager.saveAll(payOrderChannels); return payOrder; @@ -171,12 +171,12 @@ public class PayAssistService { List tradesStatus = Arrays.asList(PayStatusEnum.FAIL.getCode(), PayStatusEnum.CANCEL.getCode(), PayStatusEnum.CLOSE.getCode()); if (tradesStatus.contains(payOrder.getStatus())) { - throw new PayFailureException("支付失败或已经被撤销"); + throw new PayFailureException("支付失败或已经被关闭"); } // 退款类型状态 tradesStatus = Arrays.asList(PayStatusEnum.REFUNDED.getCode(), PayStatusEnum.PARTIAL_REFUND.getCode()); if (tradesStatus.contains(payOrder.getStatus())) { - throw new PayFailureException("支付失败或已经被撤销"); + throw new PayFailureException("退款中"); } // 支付超时状态 if (Objects.nonNull(payOrder.getExpiredTime()) diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/service/PayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/service/PayService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java index 8482265aa..2fc79b579 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/service/PayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java @@ -1,18 +1,18 @@ -package cn.bootx.platform.daxpay.core.payment.pay.service; +package cn.bootx.platform.daxpay.service.core.payment.pay.service; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.core.payment.pay.factory.PayStrategyFactory; -import cn.bootx.platform.daxpay.core.record.pay.builder.PaymentBuilder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.core.payment.pay.factory.PayStrategyFactory; +import cn.bootx.platform.daxpay.service.core.record.pay.builder.PaymentBuilder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; -import cn.bootx.platform.daxpay.func.PayStrategyConsumer; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.func.PayStrategyConsumer; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.bootx.platform.daxpay.param.pay.SimplePayParam; import cn.bootx.platform.daxpay.result.pay.PayResult; -import cn.bootx.platform.daxpay.util.PayUtil; +import cn.bootx.platform.daxpay.service.util.PayUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; @@ -53,7 +53,7 @@ public class PayService { @Transactional(rollbackFor = Exception.class) public PayResult pay(PayParam payParam) { // 异步支付方式检查 - PayUtil.validationAsyncPayMode(payParam); + PayUtil.validationAsyncPay(payParam); // 获取并校验支付订单状态 PayOrder payOrder = payAssistService.getOrderAndCheck(payParam.getBusinessNo()); @@ -82,7 +82,7 @@ public class PayService { payWayParam.setWay(simplePayParam.getPayWay()); payWayParam.setAmount(simplePayParam.getAmount()); payWayParam.setChannelExtra(simplePayParam.getChannelExtra()); - BeanUtil.copyProperties(simplePayParam,payWayParam, CopyOptions.create().ignoreNullValue()); + BeanUtil.copyProperties(simplePayParam,payParam, CopyOptions.create().ignoreNullValue()); payParam.setPayWays(Collections.singletonList(payWayParam)); // 复用支付下单接口 return this.pay(payParam); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/AliPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/AliPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java index e2a82fb5b..b21bed85a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/AliPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java @@ -1,15 +1,15 @@ -package cn.bootx.platform.daxpay.core.payment.pay.strategy; +package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.common.exception.ExceptionInfo; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayCloseService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayConfigService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayOrderService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayService; +import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayCloseService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayService; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import cn.bootx.platform.daxpay.param.channel.AliPayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.hutool.core.util.StrUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/CashPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/CashPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java index 13f9af837..f7ef94b21 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/CashPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.pay.strategy; +package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.cash.service.CashService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.cash.service.CashService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/UnionPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/UnionPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java index f342279be..319982d65 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/UnionPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.payment.pay.strategy; +package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.common.exception.ExceptionInfo; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/VoucherPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java similarity index 82% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/VoucherPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java index 0c55b9dfa..a72e1d434 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/VoucherPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.payment.pay.strategy; +package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher; -import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherRecord; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayService; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.Voucher; +import cn.bootx.platform.daxpay.service.core.channel.voucher.entity.VoucherRecord; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayService; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/WalletPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/WalletPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java index 01a3db2ef..8a7432872 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/WalletPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java @@ -1,16 +1,16 @@ -package cn.bootx.platform.daxpay.core.payment.pay.strategy; +package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.code.WalletCode; -import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayService; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayOrderService; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletQueryService; +import cn.bootx.platform.daxpay.service.code.WalletCode; +import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.Wallet; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayService; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletQueryService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.exception.waller.WalletBannedException; import cn.bootx.platform.daxpay.exception.waller.WalletLackOfBalanceException; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletPayParam; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletPayParam; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONException; import cn.hutool.json.JSONUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/WeChatPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/WeChatPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java index e4f8c1589..82d6e34d2 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/pay/strategy/WeChatPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java @@ -1,17 +1,17 @@ -package cn.bootx.platform.daxpay.core.payment.pay.strategy; +package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.common.exception.ExceptionInfo; -import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayConfigManager; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayCloseService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayOrderService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPaySyncService; +import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo; +import cn.bootx.platform.daxpay.service.core.channel.wechat.dao.WeChatPayConfigManager; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayCloseService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPaySyncService; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.func.AbsPayStrategy; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayParam; +import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONException; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/factory/PayRefundStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/PayRefundStrategyFactory.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/factory/PayRefundStrategyFactory.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/PayRefundStrategyFactory.java index bfb8d2b7b..6f3d3a501 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/factory/PayRefundStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/PayRefundStrategyFactory.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.refund.factory; +package cn.bootx.platform.daxpay.service.core.payment.refund.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; -import cn.bootx.platform.daxpay.core.payment.refund.strategy.*; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; +import cn.bootx.platform.daxpay.service.core.payment.refund.strategy.*; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.val; @@ -25,7 +25,7 @@ import static cn.bootx.platform.daxpay.code.PayChannelEnum.ASYNC_TYPE_CODE; public class PayRefundStrategyFactory { /** - * 根据传入的支付渠道创建策略 + * 根据传入的支付通道创建策略 * @return 支付策略 */ public static AbsPayRefundStrategy createAsyncFront(RefundChannelParam refundChannelParam) { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/service/PayRefundAssistService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/PayRefundAssistService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/service/PayRefundAssistService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/PayRefundAssistService.java index cdbb0cef9..dbe059c9e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/service/PayRefundAssistService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/PayRefundAssistService.java @@ -1,17 +1,17 @@ -package cn.bootx.platform.daxpay.core.payment.refund.service; +package cn.bootx.platform.daxpay.service.core.payment.refund.service; import cn.bootx.platform.common.core.exception.ValidationFailedException; import cn.bootx.platform.common.core.util.CollUtil; import cn.bootx.platform.daxpay.code.PayRefundStatusEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.context.AsyncRefundLocal; -import cn.bootx.platform.daxpay.common.context.NoticeLocal; -import cn.bootx.platform.daxpay.common.context.PlatformLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.core.record.refund.dao.PayRefundOrderManager; -import cn.bootx.platform.daxpay.core.record.refund.entity.PayRefundOrder; +import cn.bootx.platform.daxpay.service.common.context.AsyncRefundLocal; +import cn.bootx.platform.daxpay.service.common.context.NoticeLocal; +import cn.bootx.platform.daxpay.service.common.context.PlatformLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.core.record.refund.dao.PayRefundOrderManager; +import cn.bootx.platform.daxpay.service.core.record.refund.entity.PayRefundOrder; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; import cn.bootx.platform.daxpay.param.pay.RefundParam; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/service/PayRefundService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/PayRefundService.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/service/PayRefundService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/PayRefundService.java index e672caffa..188fd1c3c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/service/PayRefundService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/PayRefundService.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.payment.refund.service; +package cn.bootx.platform.daxpay.service.core.payment.refund.service; import cn.bootx.platform.common.core.util.ValidationUtil; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.core.payment.refund.factory.PayRefundStrategyFactory; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.core.payment.refund.factory.PayRefundStrategyFactory; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; import cn.bootx.platform.daxpay.param.pay.RefundParam; import cn.bootx.platform.daxpay.param.pay.SimpleRefundParam; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/AliPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/AliPayRefundStrategy.java similarity index 72% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/AliPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/AliPayRefundStrategy.java index ae4df6429..4032f9d16 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/AliPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/AliPayRefundStrategy.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.payment.refund.strategy; +package cn.bootx.platform.daxpay.service.core.payment.refund.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayOrderService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayRefundService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayConfigService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayRefundService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/CashPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/CashPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java index 96c1ed0f7..da1165fa8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/CashPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.core.payment.refund.strategy; +package cn.bootx.platform.daxpay.service.core.payment.refund.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.cash.service.CashService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.core.channel.cash.service.CashService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/UnionPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/UnionPayRefundStrategy.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/UnionPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/UnionPayRefundStrategy.java index b66c5ad23..922cf6f1a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/UnionPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/UnionPayRefundStrategy.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.payment.refund.strategy; +package cn.bootx.platform.daxpay.service.core.payment.refund.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/VoucherPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java similarity index 75% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/VoucherPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java index 4ffb3e689..b67355b9f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/VoucherPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.refund.strategy; +package cn.bootx.platform.daxpay.service.core.payment.refund.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayService; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayOrderService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayService; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayOrderService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/WalletPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java similarity index 75% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/WalletPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java index 8cec82779..4b2568291 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/WalletPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.refund.strategy; +package cn.bootx.platform.daxpay.service.core.payment.refund.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayService; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayOrderService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayService; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayOrderService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/WeChatPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WeChatPayRefundStrategy.java similarity index 73% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/WeChatPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WeChatPayRefundStrategy.java index de4c29641..eee2646fa 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/refund/strategy/WeChatPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WeChatPayRefundStrategy.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.payment.refund.strategy; +package cn.bootx.platform.daxpay.service.core.payment.refund.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayConfigService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayOrderService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WechatRefundService; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRefundStrategy; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WechatRefundService; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayRefundStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/factory/PayRepairStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/factory/PayRepairStrategyFactory.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/factory/PayRepairStrategyFactory.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/factory/PayRepairStrategyFactory.java index 58818487d..c31e782b5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/factory/PayRepairStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/factory/PayRepairStrategyFactory.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.core.payment.repair.factory; +package cn.bootx.platform.daxpay.service.core.payment.repair.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.payment.repair.strategy.*; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.core.payment.repair.strategy.*; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.experimental.UtilityClass; @@ -25,7 +25,7 @@ import static cn.bootx.platform.daxpay.code.PayChannelEnum.ASYNC_TYPE_CODE; @UtilityClass public class PayRepairStrategyFactory { /** - * 根据传入的支付渠道创建策略 + * 根据传入的支付通道创建策略 * @return 支付策略 */ public static AbsPayRepairStrategy create(PayChannelEnum channelEnum) { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/param/PayRepairParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/param/PayRepairParam.java similarity index 71% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/param/PayRepairParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/param/PayRepairParam.java index b784fdfa8..27bf60b50 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/param/PayRepairParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/param/PayRepairParam.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.payment.repair.param; +package cn.bootx.platform.daxpay.service.core.payment.repair.param; -import cn.bootx.platform.daxpay.code.PayRepairSourceEnum; -import cn.bootx.platform.daxpay.code.PayRepairTypeEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/service/PayRepairService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java similarity index 75% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/service/PayRepairService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java index 1258e4bd2..c46f9a3e1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/service/PayRepairService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.payment.repair.service; +package cn.bootx.platform.daxpay.service.core.payment.repair.service; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; -import cn.bootx.platform.daxpay.core.payment.repair.factory.PayRepairStrategyFactory; -import cn.bootx.platform.daxpay.core.payment.repair.param.PayRepairParam; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.core.payment.repair.factory.PayRepairStrategyFactory; +import cn.bootx.platform.daxpay.service.core.payment.repair.param.PayRepairParam; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -49,6 +49,9 @@ public class PayRepairService { case CLOSE: this.close(order, repairStrategies); break; + case TIMEOUT: + this.timeout(order, repairStrategies); + break; case REFUND: this.refund(order, repairStrategies); break; @@ -84,6 +87,15 @@ public class PayRepairService { payOrder.setStatus(PayStatusEnum.CLOSE.getCode()); payOrderService.updateById(payOrder); } + /** + * 支付超时关闭订单 + */ + private void timeout(PayOrder payOrder, List absPayStrategies) { + // 执行策略的关闭方法 + absPayStrategies.forEach(AbsPayRepairStrategy::doTimeoutHandler); + payOrder.setStatus(PayStatusEnum.TIMEOUT.getCode()); + payOrderService.updateById(payOrder); + } /** * 退款 TODO 需要调用退款同步策略进行补偿 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/AliPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/AliPayRepairStrategy.java similarity index 67% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/AliPayRepairStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/AliPayRepairStrategy.java index c86d06ff8..67d9abb84 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/AliPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/AliPayRepairStrategy.java @@ -1,15 +1,15 @@ -package cn.bootx.platform.daxpay.core.payment.repair.strategy; +package cn.bootx.platform.daxpay.service.core.payment.repair.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.code.PayRepairSourceEnum; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayCloseService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayOrderService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayConfigService; -import cn.bootx.platform.daxpay.core.record.pay.dao.PayOrderChannelManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayCloseService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderChannelManager; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; @@ -63,6 +63,16 @@ public class AliPayRepairStrategy extends AbsPayRepairStrategy { orderService.updateClose(this.getOrder().getId()); } + + /** + * 订单支付超时取消支付 + */ + @Override + public void doTimeoutHandler() { + closeService.close(this.getOrder()); + orderService.updateClose(this.getOrder().getId()); + } + /** * 退款 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/CashPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/CashPayRepairStrategy.java similarity index 74% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/CashPayRepairStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/CashPayRepairStrategy.java index 2c2979a58..33e75214f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/CashPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/CashPayRepairStrategy.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.payment.repair.strategy; +package cn.bootx.platform.daxpay.service.core.payment.repair.strategy; -import cn.bootx.platform.daxpay.core.channel.cash.service.CashService; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.core.channel.cash.service.CashService; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/UnionPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/UnionPayRepairStrategy.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/UnionPayRepairStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/UnionPayRepairStrategy.java index fc8df2dc2..dc754f825 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/UnionPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/UnionPayRepairStrategy.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.payment.repair.strategy; +package cn.bootx.platform.daxpay.service.core.payment.repair.strategy; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/VoucherPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/VoucherPayRepairStrategy.java similarity index 71% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/VoucherPayRepairStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/VoucherPayRepairStrategy.java index c65a025ad..95c813e02 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/VoucherPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/VoucherPayRepairStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.payment.repair.strategy; +package cn.bootx.platform.daxpay.service.core.payment.repair.strategy; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayOrderService; -import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayService; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.voucher.service.VoucherPayService; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/WalletPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/WalletPayRepairStrategy.java similarity index 71% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/WalletPayRepairStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/WalletPayRepairStrategy.java index 44450275c..7d485917b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/repair/strategy/WalletPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/WalletPayRepairStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.core.payment.repair.strategy; +package cn.bootx.platform.daxpay.service.core.payment.repair.strategy; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayOrderService; -import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayService; -import cn.bootx.platform.daxpay.func.AbsPayRepairStrategy; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayOrderService; +import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletPayService; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/WeChatPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/WeChatPayRepairStrategy.java new file mode 100644 index 000000000..eb6853825 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/WeChatPayRepairStrategy.java @@ -0,0 +1,83 @@ +package cn.bootx.platform.daxpay.service.core.payment.repair.strategy; + +import cn.bootx.platform.daxpay.code.PayChannelEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayCloseService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayOrderService; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderChannelManager; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.exception.pay.PayFailureException; +import cn.bootx.platform.daxpay.service.func.AbsPayRepairStrategy; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Service; + +import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; + +/** + * + * @author xxm + * @since 2023/12/29 + */ +@Slf4j +@Scope(SCOPE_PROTOTYPE) +@Service +@RequiredArgsConstructor +public class WeChatPayRepairStrategy extends AbsPayRepairStrategy { + private final WeChatPayCloseService closeService; + private final WeChatPayOrderService orderService; + private final PayOrderChannelManager payOrderChannelManager; + + private final WeChatPayConfigService weChatPayConfigService; + + private WeChatPayConfig weChatPayConfig; + + /** + * 修复前处理 + */ + @Override + public void doBeforeHandler() { + this.weChatPayConfig = weChatPayConfigService.getConfig(); + } + + /** + * 支付成功处理 + */ + @Override + public void doSuccessHandler() { + PayOrderChannel orderChannel = payOrderChannelManager.findByPaymentIdAndChannel(this.getOrder().getId(), PayChannelEnum.WECHAT.getCode()) + .orElseThrow(() -> new PayFailureException("支付宝订单不存在")); + orderService.updateAsyncSuccess(this.getOrder(), orderChannel.getAmount()); + } + + /** + * 退款处理 todo 需要结合退款同步功能进行协同实现 + */ + @Override + public void doRefundHandler() { + } + + /** + * 取消支付 + */ + @Override + public void doCloseHandler() { + // 如果非同步出的订单取消状态, 则调用支付网关关闭订单 + if (this.getRepairSource() != PayRepairSourceEnum.SYNC){ + closeService.close(this.getOrder(),this.weChatPayConfig); + } + orderService.updateClose(this.getOrder().getId()); + } + + /** + * 订单支付超时取消支付 + */ + @Override + public void doTimeoutHandler() { + closeService.close(this.getOrder(),this.weChatPayConfig); + orderService.updateClose(this.getOrder().getId()); + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/factory/PaySyncStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/factory/PaySyncStrategyFactory.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/factory/PaySyncStrategyFactory.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/factory/PaySyncStrategyFactory.java index 08a79a79d..a7ee58c9f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/factory/PaySyncStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/factory/PaySyncStrategyFactory.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.sync.factory; +package cn.bootx.platform.daxpay.service.core.payment.sync.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.func.AbsPaySyncStrategy; -import cn.bootx.platform.daxpay.core.payment.sync.strategy.AliPaySyncStrategy; -import cn.bootx.platform.daxpay.core.payment.sync.strategy.WeChatPaySyncStrategy; +import cn.bootx.platform.daxpay.service.func.AbsPaySyncStrategy; +import cn.bootx.platform.daxpay.service.core.payment.sync.strategy.AliPaySyncStrategy; +import cn.bootx.platform.daxpay.service.core.payment.sync.strategy.WeChatPaySyncStrategy; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; import cn.hutool.extra.spring.SpringUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/result/GatewaySyncResult.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/result/GatewaySyncResult.java similarity index 82% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/result/GatewaySyncResult.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/result/GatewaySyncResult.java index cb63c0a34..20fa27784 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/result/GatewaySyncResult.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/result/GatewaySyncResult.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.payment.sync.result; +package cn.bootx.platform.daxpay.service.core.payment.sync.result; import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; import lombok.Data; @@ -20,7 +20,7 @@ public class GatewaySyncResult { * 支付网关同步状态 * @see PaySyncStatusEnum#NOT_SYNC */ - private String syncStatus = NOT_SYNC.getCode(); + private PaySyncStatusEnum syncStatus = NOT_SYNC; /** 网关返回对象的json字符串 */ private String json; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/service/PaySyncService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java similarity index 62% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/service/PaySyncService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java index 1dca026ea..365462372 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/service/PaySyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java @@ -1,25 +1,29 @@ -package cn.bootx.platform.daxpay.core.payment.sync.service; +package cn.bootx.platform.daxpay.service.core.payment.sync.service; import cn.bootx.platform.common.core.exception.BizException; -import cn.bootx.platform.daxpay.code.PayRepairSourceEnum; -import cn.bootx.platform.daxpay.code.PayRepairTypeEnum; +import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; -import cn.bootx.platform.daxpay.core.payment.repair.param.PayRepairParam; -import cn.bootx.platform.daxpay.core.payment.repair.service.PayRepairService; -import cn.bootx.platform.daxpay.core.payment.sync.factory.PaySyncStrategyFactory; -import cn.bootx.platform.daxpay.core.payment.sync.result.GatewaySyncResult; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.service.PayOrderService; -import cn.bootx.platform.daxpay.core.record.sync.service.PaySyncOrderService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.func.AbsPaySyncStrategy; import cn.bootx.platform.daxpay.param.pay.PaySyncParam; import cn.bootx.platform.daxpay.result.pay.PaySyncResult; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.code.PayRepairTypeEnum; +import cn.bootx.platform.daxpay.service.core.payment.repair.param.PayRepairParam; +import cn.bootx.platform.daxpay.service.core.payment.repair.service.PayRepairService; +import cn.bootx.platform.daxpay.service.core.payment.sync.factory.PaySyncStrategyFactory; +import cn.bootx.platform.daxpay.service.core.payment.sync.result.GatewaySyncResult; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.service.PayOrderService; +import cn.bootx.platform.daxpay.service.core.record.sync.service.PaySyncOrderService; +import cn.bootx.platform.daxpay.service.func.AbsPaySyncStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; import java.util.Objects; /** @@ -64,13 +68,12 @@ public class PaySyncService { */ public PaySyncResult syncPayOrder(PayOrder order) { // 获取同步策略类 - AbsPaySyncStrategy syncPayStrategy = PaySyncStrategyFactory.create(order.getAsyncPayChannel()); + AbsPaySyncStrategy syncPayStrategy = PaySyncStrategyFactory.create(order.getAsyncChannel()); syncPayStrategy.initPayParam(order); - // 同步支付状态 + // 获取网关支付状态 GatewaySyncResult syncResult = syncPayStrategy.doSyncStatus(); - - // 判断网关状态是否和支付单一致 - boolean statusSync = this.isStatusSync(syncResult,order); + // 判断网关状态是否和支付单一致, 同时更新网关同步状态 + boolean statusSync = this.checkStatusSync(syncResult,order); // 状态不一致，执行支付单修复逻辑 if (!statusSync){ // 根据同步记录对支付单进行处理处理 @@ -78,31 +81,41 @@ public class PaySyncService { } // 记录同步的结果 syncOrderService.saveRecord(syncResult,order); - return new PaySyncResult().setSuccess(true).setRepair(!statusSync).setSyncStatus(syncResult.getSyncStatus()); + return new PaySyncResult() + .setSuccess(true) + .setRepair(!statusSync) + .setSyncStatus(syncResult.getSyncStatus().getCode()); } /** - * 支付单和网关状态是否一致 + * 支付单和网关状态是否一致, 同时待支付状态下, 处理支付超时情况 */ - public boolean isStatusSync(GatewaySyncResult syncResult, PayOrder order){ - String syncStatus = syncResult.getSyncStatus(); + public boolean checkStatusSync(GatewaySyncResult syncResult, PayOrder order){ + PaySyncStatusEnum syncStatus = syncResult.getSyncStatus(); String orderStatus = order.getStatus(); // 支付成功比对 - if (orderStatus.equals(PayStatusEnum.SUCCESS.getCode()) && syncStatus.equals(PaySyncStatusEnum.PAY_SUCCESS.getCode())){ + if (orderStatus.equals(PayStatusEnum.SUCCESS.getCode()) && syncStatus.equals(PaySyncStatusEnum.PAY_SUCCESS)){ return true; } - // 待支付比对 - if (orderStatus.equals(PayStatusEnum.PROGRESS.getCode()) && syncStatus.equals(PaySyncStatusEnum.PAY_WAIT.getCode())){ + + // 待支付比对 网关忽略和支付中都代表待支付, 需要处理订单超时的情况 + List enums = Arrays.asList(PaySyncStatusEnum.PAY_WAIT, PaySyncStatusEnum.IGNORE); + if (orderStatus.equals(PayStatusEnum.PROGRESS.getCode()) && enums.contains(syncStatus)){ + // 判断支付单是否支付超时, 如果待支付状态下触发超时 + if (LocalDateTimeUtil.le(order.getExpiredTime(), LocalDateTime.now())){ + syncResult.setSyncStatus(PaySyncStatusEnum.TIMEOUT); + return false; + } return true; } // 支付关闭比对 - if (orderStatus.equals(PayStatusEnum.CLOSE.getCode()) && syncStatus.equals(PaySyncStatusEnum.CLOSED.getCode())){ + if (orderStatus.equals(PayStatusEnum.CLOSE.getCode()) && syncStatus.equals(PaySyncStatusEnum.CLOSED)){ return true; } // 退款比对 - if (orderStatus.equals(PayStatusEnum.REFUNDED.getCode()) && syncStatus.equals(PaySyncStatusEnum.REFUND.getCode())){ + if (orderStatus.equals(PayStatusEnum.REFUNDED.getCode()) && syncStatus.equals(PaySyncStatusEnum.REFUND)){ return true; } return false; @@ -112,8 +125,7 @@ public class PaySyncService { * 根据同步的结果对支付单进行处理 */ private void resultHandler(GatewaySyncResult syncResult, PayOrder payOrder){ - - PaySyncStatusEnum syncStatusEnum = PaySyncStatusEnum.getByCode(syncResult.getSyncStatus()); + PaySyncStatusEnum syncStatusEnum = syncResult.getSyncStatus(); PayRepairParam repairParam = new PayRepairParam().setRepairSource(PayRepairSourceEnum.SYNC); // 对支付网关同步的结果进行处理 switch (syncStatusEnum) { @@ -128,10 +140,9 @@ public class PaySyncService { log.info("依然是付款状态"); break; } - // 订单已经关闭超时关闭 和 网关没找到记录, + // 订单已经超时关闭 和 网关没找到记录, 对订单进行关闭 case CLOSED: case NOT_FOUND: { - // 判断下是否超时, 变更为关闭支付 repairParam.setRepairType(PayRepairTypeEnum.CLOSE); repairService.repair(payOrder, repairParam); break; @@ -142,7 +153,14 @@ public class PaySyncService { repairService.repair(payOrder, repairParam); break; } + // 不需要进行处理 + case IGNORE: + break; // 调用出错 + case TIMEOUT: + repairParam.setRepairType(PayRepairTypeEnum.TIMEOUT); + repairService.repair(payOrder, repairParam); + break; case FAIL: { // 不进行处理 TODO 添加重试 log.warn("支付状态同步接口调用出错"); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/strategy/AliPaySyncStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/strategy/AliPaySyncStrategy.java similarity index 68% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/strategy/AliPaySyncStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/strategy/AliPaySyncStrategy.java index 719aa80a2..6d5ea9c88 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/strategy/AliPaySyncStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/strategy/AliPaySyncStrategy.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.payment.sync.strategy; +package cn.bootx.platform.daxpay.service.core.payment.sync.strategy; -import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayConfig; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayConfigService; -import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPaySyncService; -import cn.bootx.platform.daxpay.func.AbsPaySyncStrategy; -import cn.bootx.platform.daxpay.core.payment.sync.result.GatewaySyncResult; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPayConfigService; +import cn.bootx.platform.daxpay.service.core.channel.alipay.service.AliPaySyncService; +import cn.bootx.platform.daxpay.service.func.AbsPaySyncStrategy; +import cn.bootx.platform.daxpay.service.core.payment.sync.result.GatewaySyncResult; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/strategy/WeChatPaySyncStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/strategy/WeChatPaySyncStrategy.java similarity index 68% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/strategy/WeChatPaySyncStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/strategy/WeChatPaySyncStrategy.java index b6abb9a91..576f1cbb8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/strategy/WeChatPaySyncStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/strategy/WeChatPaySyncStrategy.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.payment.sync.strategy; +package cn.bootx.platform.daxpay.service.core.payment.sync.strategy; -import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayConfigService; -import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPaySyncService; -import cn.bootx.platform.daxpay.core.payment.sync.result.GatewaySyncResult; -import cn.bootx.platform.daxpay.func.AbsPaySyncStrategy; +import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService; +import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPaySyncService; +import cn.bootx.platform.daxpay.service.core.payment.sync.result.GatewaySyncResult; +import cn.bootx.platform.daxpay.service.func.AbsPaySyncStrategy; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/task/PayOrderSyncTaskService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/task/PayOrderSyncTaskService.java similarity index 78% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/task/PayOrderSyncTaskService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/task/PayOrderSyncTaskService.java index c8e5f8c21..97d9a3bc9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/payment/sync/task/PayOrderSyncTaskService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/task/PayOrderSyncTaskService.java @@ -1,7 +1,6 @@ -package cn.bootx.platform.daxpay.core.payment.sync.task; +package cn.bootx.platform.daxpay.service.core.payment.sync.task; -import cn.bootx.platform.daxpay.core.payment.sync.service.PaySyncService; -import cn.bootx.platform.daxpay.core.timeout.dao.PayExpiredTimeRepository; +import cn.bootx.platform.daxpay.service.core.payment.sync.service.PaySyncService; import cn.bootx.platform.daxpay.param.pay.PaySyncParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,7 +15,7 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor public class PayOrderSyncTaskService { - private final PayExpiredTimeRepository PayExpiredTimeRepository; + private final cn.bootx.platform.daxpay.service.core.timeout.dao.PayExpiredTimeRepository PayExpiredTimeRepository; private final PaySyncService paySyncService; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/convert/CallbackRecordMConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/convert/CallbackRecordMConvert.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/convert/CallbackRecordMConvert.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/convert/CallbackRecordMConvert.java index 992253475..00ae52dc7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/convert/CallbackRecordMConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/convert/CallbackRecordMConvert.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.record.callback.convert; +package cn.bootx.platform.daxpay.service.core.record.callback.convert; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/dao/CallbackRecordManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/dao/CallbackRecordManager.java similarity index 68% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/dao/CallbackRecordManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/dao/CallbackRecordManager.java index 2016a7d3f..9833dd29b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/dao/CallbackRecordManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/dao/CallbackRecordManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.record.callback.dao; +package cn.bootx.platform.daxpay.service.core.record.callback.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.record.callback.entity.CallbackRecord; +import cn.bootx.platform.daxpay.service.core.record.callback.entity.CallbackRecord; 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/core/record/callback/dao/CallbackRecordMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/dao/CallbackRecordMapper.java similarity index 60% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/dao/CallbackRecordMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/dao/CallbackRecordMapper.java index 58dae43f7..7771f1935 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/dao/CallbackRecordMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/dao/CallbackRecordMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.record.callback.dao; +package cn.bootx.platform.daxpay.service.core.record.callback.dao; -import cn.bootx.platform.daxpay.core.record.callback.entity.CallbackRecord; +import cn.bootx.platform.daxpay.service.core.record.callback.entity.CallbackRecord; 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/core/record/callback/entity/CallbackRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/CallbackRecord.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/entity/CallbackRecord.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/CallbackRecord.java index 4fa65aed6..1a9e7ec86 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/entity/CallbackRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/entity/CallbackRecord.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.record.callback.entity; +package cn.bootx.platform.daxpay.service.core.record.callback.entity; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.platform.daxpay.code.PayChannelEnum; @@ -26,10 +26,10 @@ public class CallbackRecord extends MpCreateEntity { private Long paymentId; /** - * 支付渠道 + * 支付通道 * @see PayChannelEnum#getCode() */ - @DbComment("支付渠道") + @DbComment("支付通道") private String payChannel; /** 通知消息 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/service/CallbackRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/service/CallbackRecordService.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/service/CallbackRecordService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/service/CallbackRecordService.java index e11dca6a9..e0c4b3ac5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/callback/service/CallbackRecordService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/callback/service/CallbackRecordService.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.record.callback.service; +package cn.bootx.platform.daxpay.service.core.record.callback.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/builder/PaymentBuilder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/builder/PaymentBuilder.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/builder/PaymentBuilder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/builder/PaymentBuilder.java index 2db776c69..4c5c4dc76 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/builder/PaymentBuilder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/builder/PaymentBuilder.java @@ -1,15 +1,15 @@ -package cn.bootx.platform.daxpay.core.record.pay.builder; +package cn.bootx.platform.daxpay.service.core.record.pay.builder; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.context.AsyncPayLocal; -import cn.bootx.platform.daxpay.common.context.NoticeLocal; -import cn.bootx.platform.daxpay.common.context.PlatformLocal; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderChannel; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderExtra; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.context.AsyncPayLocal; +import cn.bootx.platform.daxpay.service.common.context.NoticeLocal; +import cn.bootx.platform.daxpay.service.common.context.PlatformLocal; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderExtra; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import cn.bootx.platform.daxpay.result.pay.PayResult; @@ -50,7 +50,7 @@ public class PaymentBuilder { .reduce(Integer::sum) .orElse(0); // 是否有异步支付方式 - Optional asyncPayMode = payParam.getPayWays().stream() + Optional asyncPay = payParam.getPayWays().stream() .map(PayWayParam::getChannel) .filter(PayChannelEnum.ASYNC_TYPE_CODE::contains) .findFirst(); @@ -63,8 +63,8 @@ public class PaymentBuilder { .setAmount(sumAmount) .setExpiredTime(expiredTime) .setCombinationPay(payParam.getPayWays().size() > 1) - .setAsyncPay(asyncPayMode.isPresent()) - .setAsyncPayChannel(asyncPayMode.orElse(null)) + .setAsyncPay(asyncPay.isPresent()) + .setAsyncChannel(asyncPay.orElse(null)) .setRefundableBalance(sumAmount); } @@ -129,8 +129,8 @@ public class PaymentBuilder { PayResult paymentResult; paymentResult = new PayResult(); paymentResult.setPaymentId(payOrder.getId()); - paymentResult.setAsyncPayMode(payOrder.isAsyncPay()); - paymentResult.setAsyncPayChannel(payOrder.getAsyncPayChannel()); + paymentResult.setAsyncPay(payOrder.isAsyncPay()); + paymentResult.setAsyncPayChannel(payOrder.getAsyncChannel()); paymentResult.setStatus(payOrder.getStatus()); // 设置异步支付参数 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderChannelManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderChannelManager.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderChannelManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderChannelManager.java index c21b4a68b..5a824dfb7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderChannelManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderChannelManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.record.pay.dao; +package cn.bootx.platform.daxpay.service.core.record.pay.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.Optional; @RequiredArgsConstructor public class PayOrderChannelManager extends BaseManager { /** - * 根据订单id和支付渠道查询 + * 根据订单id和支付通道查询 */ public Optional findByPaymentIdAndChannel(Long paymentId, String channel) { return lambdaQuery() diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderChannelMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderChannelMapper.java similarity index 66% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderChannelMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderChannelMapper.java index dfb618a46..f66f6b0db 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderChannelMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderChannelMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.record.pay.dao; +package cn.bootx.platform.daxpay.service.core.record.pay.dao; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; 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/core/record/pay/dao/PayOrderExtraManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderExtraManager.java similarity index 73% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderExtraManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderExtraManager.java index a04d30008..acde023dd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderExtraManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderExtraManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.record.pay.dao; +package cn.bootx.platform.daxpay.service.core.record.pay.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderExtra; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderExtra; 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/core/record/pay/dao/PayOrderExtraMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderExtraMapper.java similarity index 64% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderExtraMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderExtraMapper.java index 322f4bc7b..13335e940 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderExtraMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderExtraMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.record.pay.dao; +package cn.bootx.platform.daxpay.service.core.record.pay.dao; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderExtra; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderExtra; 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/core/record/pay/dao/PayOrderManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderManager.java similarity index 79% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderManager.java index ffe14b738..447838070 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.record.pay.dao; +package cn.bootx.platform.daxpay.service.core.record.pay.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; 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/core/record/pay/dao/PayOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderMapper.java similarity index 63% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderMapper.java index 2cc0cdf1a..32566c62b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/dao/PayOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/dao/PayOrderMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.record.pay.dao; +package cn.bootx.platform.daxpay.service.core.record.pay.dao; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; 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/core/record/pay/entity/PayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrder.java similarity index 81% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrder.java index 660749337..e8d26eae1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrder.java @@ -1,12 +1,13 @@ -package cn.bootx.platform.daxpay.core.record.pay.entity; +package cn.bootx.platform.daxpay.service.core.record.pay.entity; import cn.bootx.platform.common.core.annotation.BigField; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.common.mybatisplus.handler.JacksonRawTypeHandler; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.typehandler.RefundableInfoTypeHandler; import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; @@ -27,8 +28,9 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "支付订单") @Accessors(chain = true) -@TableName("pay_order") +@TableName(value = "pay_order",autoResultMap = true) public class PayOrder extends MpBaseEntity { /** 关联的业务id */ @@ -49,11 +51,11 @@ public class PayOrder extends MpBaseEntity { private boolean combinationPay; /** - * 异步支付渠道 + * 异步支付通道 * @see PayChannelEnum#ASYNC_TYPE_CODE */ - @DbColumn(comment = "异步支付渠道") - private String asyncPayChannel; + @DbColumn(comment = "异步支付通道") + private String asyncChannel; /** 金额 */ @DbColumn(comment = "金额") @@ -67,7 +69,7 @@ public class PayOrder extends MpBaseEntity { * 退款信息列表 * @see OrderRefundableInfo */ - @TableField(typeHandler = JacksonRawTypeHandler.class) + @TableField(typeHandler = RefundableInfoTypeHandler.class) @BigField @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) @DbColumn(comment = "退款信息列表") @@ -87,4 +89,5 @@ public class PayOrder extends MpBaseEntity { /** 过期时间 */ @DbColumn(comment = "过期时间") private LocalDateTime expiredTime; + } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrderChannel.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrderChannel.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrderChannel.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrderChannel.java index b5541bb52..759ca3eb0 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrderChannel.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrderChannel.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.record.pay.entity; +package cn.bootx.platform.daxpay.service.core.record.pay.entity; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.platform.daxpay.param.channel.AliPayParam; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrderExtra.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrderExtra.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrderExtra.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrderExtra.java index 8b54eb3b0..c4eba694b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/entity/PayOrderExtra.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/entity/PayOrderExtra.java @@ -1,8 +1,9 @@ -package cn.bootx.platform.daxpay.core.record.pay.entity; +package cn.bootx.platform.daxpay.service.core.record.pay.entity; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; 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; @@ -20,6 +21,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) +@DbTable(comment = "支付订单扩展信息") @TableName("pay_order_extra") public class PayOrderExtra extends MpBaseEntity { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/service/PayOrderChannelService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/service/PayOrderChannelService.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/service/PayOrderChannelService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/service/PayOrderChannelService.java index 20eb50ba3..3efaec6d7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/service/PayOrderChannelService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/service/PayOrderChannelService.java @@ -1,9 +1,9 @@ -package cn.bootx.platform.daxpay.core.record.pay.service; +package cn.bootx.platform.daxpay.service.core.record.pay.service; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.core.record.pay.dao.PayOrderChannelManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrderChannel; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderChannelManager; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrderChannel; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/service/PayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/service/PayOrderService.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/service/PayOrderService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/service/PayOrderService.java index af8ffa9aa..addb40a16 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/pay/service/PayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/pay/service/PayOrderService.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.record.pay.service; +package cn.bootx.platform.daxpay.service.core.record.pay.service; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; -import cn.bootx.platform.daxpay.core.record.pay.dao.PayOrderManager; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.timeout.service.PayExpiredTimeService; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderManager; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.timeout.service.PayExpiredTimeService; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/convert/RefundConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/convert/RefundConvert.java similarity index 54% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/convert/RefundConvert.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/convert/RefundConvert.java index 95f161686..410ede74a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/convert/RefundConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/convert/RefundConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.record.refund.convert; +package cn.bootx.platform.daxpay.service.core.record.refund.convert; -import cn.bootx.platform.daxpay.core.record.refund.entity.PayRefundOrder; -import cn.bootx.platform.daxpay.dto.order.refund.PayRefundOrderDto; +import cn.bootx.platform.daxpay.service.core.record.refund.entity.PayRefundOrder; +import cn.bootx.platform.daxpay.service.dto.order.refund.PayRefundOrderDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/dao/PayRefundOrderManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/dao/PayRefundOrderManager.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/dao/PayRefundOrderManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/dao/PayRefundOrderManager.java index 3368ad057..29c4fd6dd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/dao/PayRefundOrderManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/dao/PayRefundOrderManager.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.record.refund.dao; +package cn.bootx.platform.daxpay.service.core.record.refund.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.record.refund.entity.PayRefundOrder; -import cn.bootx.platform.daxpay.dto.order.refund.PayRefundOrderDto; +import cn.bootx.platform.daxpay.service.core.record.refund.entity.PayRefundOrder; +import cn.bootx.platform.daxpay.service.dto.order.refund.PayRefundOrderDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/dao/PayRefundOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/dao/PayRefundOrderMapper.java similarity index 61% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/dao/PayRefundOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/dao/PayRefundOrderMapper.java index 5622fd61d..a3b1b84c1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/dao/PayRefundOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/dao/PayRefundOrderMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.record.refund.dao; +package cn.bootx.platform.daxpay.service.core.record.refund.dao; -import cn.bootx.platform.daxpay.core.record.refund.entity.PayRefundOrder; +import cn.bootx.platform.daxpay.service.core.record.refund.entity.PayRefundOrder; 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/core/record/refund/entity/PayRefundOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/entity/PayRefundOrder.java similarity index 72% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/entity/PayRefundOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/entity/PayRefundOrder.java index 5be7d0cfe..96ecc3124 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/entity/PayRefundOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/entity/PayRefundOrder.java @@ -1,12 +1,14 @@ -package cn.bootx.platform.daxpay.core.record.refund.entity; +package cn.bootx.platform.daxpay.service.core.record.refund.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.common.mybatisplus.handler.JacksonRawTypeHandler; import cn.bootx.platform.daxpay.code.PayRefundStatusEnum; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; -import cn.bootx.platform.daxpay.core.record.refund.convert.RefundConvert; -import cn.bootx.platform.daxpay.dto.order.refund.PayRefundOrderDto; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.typehandler.RefundableInfoTypeHandler; +import cn.bootx.platform.daxpay.service.core.record.refund.convert.RefundConvert; +import cn.bootx.platform.daxpay.service.dto.order.refund.PayRefundOrderDto; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -58,7 +60,8 @@ public class PayRefundOrder extends MpBaseEntity implements EntityBaseFunction

refundableInfo; /** diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/service/PayRefundRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/service/PayRefundRecordService.java similarity index 77% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/service/PayRefundRecordService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/service/PayRefundRecordService.java index 94f975b14..cce63dce1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/refund/service/PayRefundRecordService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/refund/service/PayRefundRecordService.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.record.refund.service; +package cn.bootx.platform.daxpay.service.core.record.refund.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.record.refund.dao.PayRefundOrderManager; -import cn.bootx.platform.daxpay.core.record.refund.entity.PayRefundOrder; -import cn.bootx.platform.daxpay.dto.order.refund.PayRefundOrderDto; +import cn.bootx.platform.daxpay.service.core.record.refund.dao.PayRefundOrderManager; +import cn.bootx.platform.daxpay.service.core.record.refund.entity.PayRefundOrder; +import cn.bootx.platform.daxpay.service.dto.order.refund.PayRefundOrderDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/convert/PaySyncRecordConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/convert/PaySyncRecordConvert.java similarity index 59% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/convert/PaySyncRecordConvert.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/convert/PaySyncRecordConvert.java index cad5721b6..cb67dcd04 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/convert/PaySyncRecordConvert.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/convert/PaySyncRecordConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.record.sync.convert; +package cn.bootx.platform.daxpay.service.core.record.sync.convert; -import cn.bootx.platform.daxpay.core.record.sync.entity.PaySyncRecord; -import cn.bootx.platform.daxpay.dto.order.sync.PaySyncRecordDto; +import cn.bootx.platform.daxpay.service.core.record.sync.entity.PaySyncRecord; +import cn.bootx.platform.daxpay.service.dto.order.sync.PaySyncRecordDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/dao/PaySyncRecordManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/dao/PaySyncRecordManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java index ed34df8ae..382265deb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/dao/PaySyncRecordManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordManager.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.record.sync.dao; +package cn.bootx.platform.daxpay.service.core.record.sync.dao; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.record.sync.entity.PaySyncRecord; -import cn.bootx.platform.daxpay.dto.order.sync.PaySyncRecordDto; +import cn.bootx.platform.daxpay.service.core.record.sync.entity.PaySyncRecord; +import cn.bootx.platform.daxpay.service.dto.order.sync.PaySyncRecordDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/dao/PaySyncRecordMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordMapper.java similarity index 63% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/dao/PaySyncRecordMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordMapper.java index 3096ac8c0..4f26c3ebd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/dao/PaySyncRecordMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/dao/PaySyncRecordMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.record.sync.dao; +package cn.bootx.platform.daxpay.service.core.record.sync.dao; -import cn.bootx.platform.daxpay.core.record.sync.entity.PaySyncRecord; +import cn.bootx.platform.daxpay.service.core.record.sync.entity.PaySyncRecord; 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/core/record/sync/entity/PaySyncRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/entity/PaySyncRecord.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java index a9eca40ea..c7109302a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/entity/PaySyncRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/entity/PaySyncRecord.java @@ -1,11 +1,11 @@ -package cn.bootx.platform.daxpay.core.record.sync.entity; +package cn.bootx.platform.daxpay.service.core.record.sync.entity; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; -import cn.bootx.platform.daxpay.core.record.sync.convert.PaySyncRecordConvert; -import cn.bootx.platform.daxpay.dto.order.sync.PaySyncRecordDto; +import cn.bootx.platform.daxpay.service.core.record.sync.convert.PaySyncRecordConvert; +import cn.bootx.platform.daxpay.service.dto.order.sync.PaySyncRecordDto; import cn.bootx.table.modify.annotation.DbComment; import cn.bootx.table.modify.annotation.DbTable; import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; @@ -35,10 +35,10 @@ public class PaySyncRecord extends MpCreateEntity implements EntityBaseFunction< /** - * 支付渠道 + * 支付通道 * @see PayChannelEnum#getCode() */ - @DbComment("支付渠道") + @DbComment("支付通道") private String channel; /** 通知消息 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/service/PaySyncOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/service/PaySyncOrderService.java similarity index 74% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/service/PaySyncOrderService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/service/PaySyncOrderService.java index 1e3f019d6..fb3929c12 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/record/sync/service/PaySyncOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/record/sync/service/PaySyncOrderService.java @@ -1,14 +1,14 @@ -package cn.bootx.platform.daxpay.core.record.sync.service; +package cn.bootx.platform.daxpay.service.core.record.sync.service; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.record.sync.dao.PaySyncRecordManager; -import cn.bootx.platform.daxpay.core.record.sync.entity.PaySyncRecord; -import cn.bootx.platform.daxpay.core.payment.sync.result.GatewaySyncResult; -import cn.bootx.platform.daxpay.dto.order.sync.PaySyncRecordDto; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.sync.dao.PaySyncRecordManager; +import cn.bootx.platform.daxpay.service.core.record.sync.entity.PaySyncRecord; +import cn.bootx.platform.daxpay.service.core.payment.sync.result.GatewaySyncResult; +import cn.bootx.platform.daxpay.service.dto.order.sync.PaySyncRecordDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -36,9 +36,9 @@ public class PaySyncOrderService { public void saveRecord(GatewaySyncResult paySyncResult, PayOrder payment){ PaySyncRecord paySyncRecord = new PaySyncRecord() .setPaymentId(payment.getId()) - .setChannel(payment.getAsyncPayChannel()) + .setChannel(payment.getAsyncChannel()) .setSyncInfo(paySyncResult.getJson()) - .setStatus(paySyncResult.getSyncStatus()) + .setStatus(paySyncResult.getSyncStatus().getCode()) .setMsg(paySyncResult.getMsg()) .setSyncTime(LocalDateTime.now()); orderManager.save(paySyncRecord); 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/convert/PayApiConfigConvert.java new file mode 100644 index 000000000..0b033a2d7 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PayApiConfigConvert.java @@ -0,0 +1,21 @@ +package cn.bootx.platform.daxpay.service.core.system.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 org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 开放接口信息转换 + * @author xxm + * @since 2023/12/22 + */ +@Mapper +public interface PayApiConfigConvert { + PayApiConfigConvert CONVERT = Mappers.getMapper(PayApiConfigConvert.class); + + PayApiConfig convert(PayApiConfigParam in); + + PayApiConfigDto convert(PayApiConfig in); +} 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/convert/PlatformConfigConvert.java new file mode 100644 index 000000000..08d86c626 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/PlatformConfigConvert.java @@ -0,0 +1,18 @@ +package cn.bootx.platform.daxpay.service.core.system.convert; + +import cn.bootx.platform.daxpay.service.core.system.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.dto.system.PlatformConfigDto; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author xxm + * @since 2024/1/2 + */ +@Mapper +public interface PlatformConfigConvert { + PlatformConfigConvert CONVERT = Mappers.getMapper(PlatformConfigConvert.class); + + PlatformConfigDto convert(PlatformConfig in); +} 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/convert/WechatNoticeConfigConvert.java new file mode 100644 index 000000000..b4fa528ee --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/convert/WechatNoticeConfigConvert.java @@ -0,0 +1,18 @@ +package cn.bootx.platform.daxpay.service.core.system.convert; + +import cn.bootx.platform.daxpay.service.core.system.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.dto.system.WechatNoticeConfigDto; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + * @author xxm + * @since 2024/1/2 + */ +@Mapper +public interface WechatNoticeConfigConvert { + WechatNoticeConfigConvert CONVERT = Mappers.getMapper(WechatNoticeConfigConvert.class); + + WechatNoticeConfigDto convert(WechatNoticeConfig in); +} 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/dao/PayApiConfigManager.java new file mode 100644 index 000000000..30e858720 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigManager.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.daxpay.service.core.system.dao; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +/** + * 支付开放接口管理 + * @author xxm + * @since 2023/12/22 + */ +@Slf4j +@Repository +@RequiredArgsConstructor +public class PayApiConfigManager extends BaseManager { + + /** + * 根据code查询 + */ + public Optional findByCode(String code){ + return findByField(PayApiConfig::getCode,code); + } + + /** + * 根据api查询 + */ + public Optional findByApi(String api){ + return findByField(PayApiConfig::getApi,api); + } + +} 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/dao/PayApiConfigMapper.java new file mode 100644 index 000000000..dc1d2212c --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PayApiConfigMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.daxpay.service.core.system.dao; + +import cn.bootx.platform.daxpay.service.core.system.entity.PayApiConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 开放接口信息 + * @author xxm + * @since 2023/12/22 + */ +@Mapper +public interface PayApiConfigMapper extends BaseMapper { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/PlatformConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigManager.java similarity index 74% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/PlatformConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigManager.java index 40892c34e..35385c844 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/PlatformConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.system.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.core.system.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/core/system/dao/PlatformConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigMapper.java similarity index 63% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/PlatformConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigMapper.java index 4dbec1a1f..76cb2e630 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/PlatformConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/PlatformConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.dao; -import cn.bootx.platform.daxpay.core.system.entity.PlatformConfig; +import cn.bootx.platform.daxpay.service.core.system.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/core/system/dao/WechatNoticeConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigManager.java similarity index 75% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/WechatNoticeConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigManager.java index d81c847f1..416cd8da0 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/WechatNoticeConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.core.system.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.core.system.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/core/system/dao/WechatNoticeConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigMapper.java similarity index 63% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/WechatNoticeConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigMapper.java index ad0848af4..2af2f7f6a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/dao/WechatNoticeConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/dao/WechatNoticeConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.core.system.dao; +package cn.bootx.platform.daxpay.service.core.system.dao; -import cn.bootx.platform.daxpay.core.system.entity.WechatNoticeConfig; +import cn.bootx.platform.daxpay.service.core.system.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/core/system/entity/OrderTimeoutConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/OrderTimeoutConfig.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/OrderTimeoutConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/OrderTimeoutConfig.java index 9665a72ff..2b7249587 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/OrderTimeoutConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/OrderTimeoutConfig.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.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/core/openapi/entity/PayApiCallRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiCallRecord.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/entity/PayApiCallRecord.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiCallRecord.java index 3dca18905..c06d18209 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/entity/PayApiCallRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiCallRecord.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.openapi.entity; +package cn.bootx.platform.daxpay.service.core.system.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/core/openapi/entity/PayOpenApi.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiConfig.java similarity index 72% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/entity/PayOpenApi.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiConfig.java index 40a64bb0b..e28556acd 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/entity/PayOpenApi.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PayApiConfig.java @@ -1,8 +1,9 @@ -package cn.bootx.platform.daxpay.core.openapi.entity; +package cn.bootx.platform.daxpay.service.core.system.entity; +import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.platform.daxpay.core.openapi.convert.PayOpenApiInfoConvert; -import cn.bootx.platform.daxpay.param.openapi.PayOpenApiInfoParam; +import cn.bootx.platform.daxpay.service.core.system.convert.PayApiConfigConvert; +import cn.bootx.platform.daxpay.service.dto.system.PayApiConfigDto; import cn.bootx.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.FieldStrategy; @@ -20,9 +21,9 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) -@DbTable(comment = "支付开放接口管理") -@TableName("pay_open_api_info") -public class PayOpenApi extends MpBaseEntity { +@DbTable(comment = "支付接口配置") +@TableName("pay_api_config") +public class PayApiConfig extends MpBaseEntity implements EntityBaseFunction { @DbColumn(comment = "编码") @TableField(updateStrategy = FieldStrategy.NEVER) @@ -58,11 +59,11 @@ public class PayOpenApi extends MpBaseEntity { private boolean record; /** - * 初始化 + * 转换 */ - public static PayOpenApi init(PayOpenApiInfoParam param){ - return PayOpenApiInfoConvert.CONVERT.convert(param); + @Override + public PayApiConfigDto toDto() { + return PayApiConfigConvert.CONVERT.convert(this); } - } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/PlatformConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PlatformConfig.java similarity index 65% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/PlatformConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PlatformConfig.java index 057c4b9cd..e3d56194e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/PlatformConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/PlatformConfig.java @@ -1,7 +1,10 @@ -package cn.bootx.platform.daxpay.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.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.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,7 +22,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @DbTable(comment = "支付平台配置") @TableName("pay_platform_config") -public class PlatformConfig extends MpBaseEntity { +public class PlatformConfig extends MpBaseEntity implements EntityBaseFunction { @DbColumn(comment = "网站地址") private String websiteUrl; @@ -40,4 +43,11 @@ public class PlatformConfig extends MpBaseEntity { private Integer orderTimeout; + /** + * 转换 + */ + @Override + public PlatformConfigDto toDto() { + return PlatformConfigConvert.CONVERT.convert(this); + } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/WechatNoticeConfig.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/WechatNoticeConfig.java similarity index 69% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/WechatNoticeConfig.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/WechatNoticeConfig.java index e11bf84d3..f494411a9 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/entity/WechatNoticeConfig.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/entity/WechatNoticeConfig.java @@ -1,6 +1,9 @@ -package cn.bootx.platform.daxpay.core.system.entity; +package cn.bootx.platform.daxpay.service.core.system.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.table.modify.annotation.DbColumn; import cn.bootx.table.modify.annotation.DbTable; import com.baomidou.mybatisplus.annotation.TableName; @@ -18,7 +21,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @DbTable(comment = "微信消息通知相关配置") @TableName("pay_wechat_notice_config") -public class WechatNoticeConfig extends MpBaseEntity { +public class WechatNoticeConfig extends MpBaseEntity implements EntityBaseFunction { @DbColumn(comment = "应用id") private String appId; @@ -38,4 +41,12 @@ public class WechatNoticeConfig extends MpBaseEntity { private String templateContent; @DbColumn(comment = "模板消息备注") private String templateRemark; + + /** + * 转换 + */ + @Override + public WechatNoticeConfigDto toDto() { + return WechatNoticeConfigConvert.CONVERT.convert(this); + } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/handler/PayOpenApiCheckHandler.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/handler/PayApiCheckHandler.java similarity index 69% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/handler/PayOpenApiCheckHandler.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/handler/PayApiCheckHandler.java index a0a8bc880..ab8afe8de 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/openapi/handler/PayOpenApiCheckHandler.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/handler/PayApiCheckHandler.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.core.openapi.handler; +package cn.bootx.platform.daxpay.service.core.system.handler; import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.daxpay.annotation.PaymentApi; -import cn.bootx.platform.daxpay.common.context.PaymentContext; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.openapi.dao.PayOpenApiManager; -import cn.bootx.platform.daxpay.core.openapi.entity.PayOpenApi; -import cn.bootx.platform.daxpay.core.openapi.service.PayOpenApiService; +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.exception.pay.PayFailureException; import cn.bootx.platform.starter.auth.service.RouterCheck; import lombok.RequiredArgsConstructor; @@ -25,9 +25,9 @@ import java.util.Objects; @Slf4j @Component @RequiredArgsConstructor -public class PayOpenApiCheckHandler implements RouterCheck { - private final PayOpenApiManager openApiInfoManager; - private final PayOpenApiService openApiService; +public class PayApiCheckHandler implements RouterCheck { + private final PayApiConfigManager openApiInfoManager; + private final PayApiConfigService openApiService; @Override public int sortNo() { @@ -44,7 +44,7 @@ public class PayOpenApiCheckHandler implements RouterCheck { return false; } String code = ignoreAuth.value(); - PayOpenApi api = openApiInfoManager.findByCode(code) + PayApiConfig api = openApiInfoManager.findByCode(code) .orElseThrow(() -> new DataNotExistException("未找到接口信息")); if (!api.isEnable()){ throw new PayFailureException("该接口权限未开放"); 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/service/PayApiConfigService.java new file mode 100644 index 000000000..5a7d3c10b --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PayApiConfigService.java @@ -0,0 +1,68 @@ +package cn.bootx.platform.daxpay.service.core.system.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.hutool.core.bean.BeanUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 开放接口信息 + * @author xxm + * @since 2023/12/22 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class PayApiConfigService { + private final PayApiConfigManager openApiInfoManager; + + /** + * 更新 + */ + public void update(PayApiConfigParam param){ + PayApiConfig payApiConfig = openApiInfoManager.findById(param.getId()) + .orElseThrow(() -> new DataNotExistException("支付接口配置信息不存在")); + BeanUtil.copyProperties(param, payApiConfig); + openApiInfoManager.updateById(payApiConfig); + } + + /** + * 分页 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(openApiInfoManager.findAll()); + } + + /** + * 根据ID获取 + */ + public PayApiConfigDto findById(Long id){ + return openApiInfoManager.findById(id).map(PayApiConfig::toDto).orElseThrow(() -> new DataNotExistException("支付接口配置信息不存在")); + } + + /** + * 初始化接口上下文信息 + */ + public void initApiInfo(PayApiConfig api){ + // 记录支付接口信息 + ApiInfoLocal apiInfoLocal = PaymentContextLocal.get().getApiInfo(); + apiInfoLocal.setApiCode(api.getCode()) + .setReqSign(api.isReqSign()) + .setResSign(api.isResSign()) + .setNotice(api.isNotice()) + .setNoticeSign(api.isNoticeSign()) + .setRecord(api.isRecord()); + } + + +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/service/PlatformConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PlatformConfigService.java similarity index 50% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/service/PlatformConfigService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PlatformConfigService.java index 890bc26f0..c2bf6a79a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/system/service/PlatformConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/PlatformConfigService.java @@ -1,8 +1,10 @@ -package cn.bootx.platform.daxpay.core.system.service; +package cn.bootx.platform.daxpay.service.core.system.service; import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.daxpay.core.system.dao.PlatformConfigManager; -import cn.bootx.platform.daxpay.core.system.entity.PlatformConfig; +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.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -28,5 +30,12 @@ public class PlatformConfigService { return platformConfigManager.findById(ID).orElseThrow(() -> new DataNotExistException("平台配置不存在")); } - + /** + * 更新配置 + */ + public void update(PlatformConfigParam param){ + PlatformConfig config = platformConfigManager.findById(ID).orElseThrow(() -> new DataNotExistException("平台配置不存在")); + BeanUtil.copyProperties(param,config); + platformConfigManager.updateById(config); + } } 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/service/WechatNoticeConfigService.java new file mode 100644 index 000000000..4c3f748a6 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/system/service/WechatNoticeConfigService.java @@ -0,0 +1,41 @@ +package cn.bootx.platform.daxpay.service.core.system.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.hutool.core.bean.BeanUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 微信消息通知相关配置 + * @author xxm + * @since 2024/1/2 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class WechatNoticeConfigService { + /** 默认配置ID */ + private static final long ID = 0L; + + private final WechatNoticeConfigManager wechatNoticeConfigManager;; + + /** + * 获取支付平台配置 + */ + public WechatNoticeConfig getConfig(){ + return wechatNoticeConfigManager.findById(ID).orElseThrow(() -> new DataNotExistException("微信消息配置不存在")); + } + + /** + * 更新配置 + */ + public void update(WechatNoticeConfigParam param){ + WechatNoticeConfig config = wechatNoticeConfigManager.findById(ID).orElseThrow(() -> new DataNotExistException("微信消息配置不存在")); + BeanUtil.copyProperties(param,config); + wechatNoticeConfigManager.updateById(config); + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/timeout/dao/PayExpiredTimeRepository.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/dao/PayExpiredTimeRepository.java similarity index 96% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/timeout/dao/PayExpiredTimeRepository.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/dao/PayExpiredTimeRepository.java index 92fa324d6..c9fc249e5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/timeout/dao/PayExpiredTimeRepository.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/dao/PayExpiredTimeRepository.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.core.timeout.dao; +package cn.bootx.platform.daxpay.service.core.timeout.dao; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.common.redis.RedisClient; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/timeout/service/PayExpiredTimeService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/service/PayExpiredTimeService.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/timeout/service/PayExpiredTimeService.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/service/PayExpiredTimeService.java index 880e99839..b59db59a8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/core/timeout/service/PayExpiredTimeService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/service/PayExpiredTimeService.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.core.timeout.service; +package cn.bootx.platform.daxpay.service.core.timeout.service; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.common.spring.exception.RetryableException; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.timeout.dao.PayExpiredTimeRepository; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.timeout.dao.PayExpiredTimeRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.retry.annotation.Retryable; @@ -33,7 +33,7 @@ public class PayExpiredTimeService { @Retryable(value = RetryableException.class) public void registerExpiredTime(PayOrder payOrder) { LocalDateTime expiredTime = payOrder.getExpiredTime(); - // 支付中且有超时时间才会注册超时关闭时间 + // 支付中且有超时时间才会注册超时关闭事件 if (Objects.equals(payOrder.getStatus(), PayStatusEnum.PROGRESS.getCode()) && Objects.nonNull(expiredTime)) { try { // 将过期时间添加到redis中, 往后延时一分钟 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/task/PayExpiredTimeTask.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/task/PayExpiredTimeTask.java new file mode 100644 index 000000000..bee3d77b6 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/timeout/task/PayExpiredTimeTask.java @@ -0,0 +1,48 @@ +package cn.bootx.platform.daxpay.service.core.timeout.task; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.daxpay.service.core.record.pay.dao.PayOrderManager; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.timeout.dao.PayExpiredTimeRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.Set; + +/** + * + * @author xxm + * @since 2024/1/2 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class PayExpiredTimeTask { + private final PayExpiredTimeRepository repository; + private final PayOrderManager payOrderManager; + +// @Scheduled(cron = "*/5 * * * * ?") + public void task(){ + log.info("执行...."); + Set expiredKeys = repository.getExpiredKeys(LocalDateTime.now()); + for (String expiredKey : expiredKeys) { + log.info("key:{}", expiredKey); + try { + // 查询对应的订单 + PayOrder payOrder = payOrderManager.findById(Long.parseLong(expiredKey)) + .orElseThrow(() -> new DataNotExistException("支付单未找到")); + // 调用订单同步逻辑. 结果如果不是支付中, 进行补偿处理 + + // 如果状态是支付中, 则进行支付超时处理 + } catch (Exception e) { + log.error("超时任务异常", e); + } + + } + + + + } +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPayConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/alipay/AliPayConfigDto.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPayConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/alipay/AliPayConfigDto.java index cac3d8eb7..11cc098df 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPayConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/alipay/AliPayConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.channel.alipay; +package cn.bootx.platform.daxpay.service.dto.channel.alipay; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; @@ -70,20 +70,14 @@ public class AliPayConfigDto extends BaseDto implements Serializable { @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) private String alipayRootCert; - @Schema(description = "超时配置") - private Integer expireTime; - @Schema(description = "可用支付方式") - private List payWayList; + private List payWays; @Schema(description = "是否沙箱环境") private boolean sandbox; - @Schema(description = "是否启用") - private Boolean activity; - @Schema(description = "状态") - private String state; + private String status; @Schema(description = "备注") private String remark; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/alipay/AliPaymentDto.java similarity index 81% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/alipay/AliPaymentDto.java index c86fcc2da..4df5f4805 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/alipay/AliPaymentDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/alipay/AliPaymentDto.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.dto.channel.alipay; +package cn.bootx.platform.daxpay.service.dto.channel.alipay; -import cn.bootx.platform.daxpay.dto.order.pay.PayOrderDto; +import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/config/PayChannelConfigDto.java similarity index 83% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/config/PayChannelConfigDto.java index 2f4e1fd7f..d75a96881 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/config/PayChannelConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/config/PayChannelConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.channel.config; +package cn.bootx.platform.daxpay.service.dto.channel.config; import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,14 +7,14 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * 支付渠道配置 + * 支付通道配置 * * @author xxm * @since 2023-05-24 */ @EqualsAndHashCode(callSuper = true) @Data -@Schema(title = "支付渠道配置") +@Schema(title = "支付通道配置") @Accessors(chain = true) public class PayChannelConfigDto extends BaseDto { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/union/UnionPayConfigDto.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/union/UnionPayConfigDto.java index cb01c084f..5022835db 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/union/UnionPayConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/union/UnionPayConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.channel.union; +package cn.bootx.platform.daxpay.service.dto.channel.union; 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/dto/channel/voucher/VoucherDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherDto.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherDto.java index 7edcc9be8..e678064fb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherDto.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.dto.channel.voucher; +package cn.bootx.platform.daxpay.service.dto.channel.voucher; import cn.bootx.platform.common.core.rest.dto.BaseDto; -import cn.bootx.platform.daxpay.code.VoucherCode; +import cn.bootx.platform.daxpay.service.code.VoucherCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherLogDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherLogDto.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherLogDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherLogDto.java index 9e2e4ad75..f36464a5b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherLogDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherLogDto.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.dto.channel.voucher; +package cn.bootx.platform.daxpay.service.dto.channel.voucher; import cn.bootx.platform.common.core.rest.dto.BaseDto; -import cn.bootx.platform.daxpay.code.VoucherCode; +import cn.bootx.platform.daxpay.service.code.VoucherCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java similarity index 73% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPayOrderDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java index 9edb41864..8fe414e1f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/voucher/VoucherPayOrderDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.dto.channel.voucher; +package cn.bootx.platform.daxpay.service.dto.channel.voucher; -import cn.bootx.platform.daxpay.dto.order.pay.PayOrderDto; +import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletConfigDto.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletConfigDto.java index 639de5d47..b717ba47c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletConfigDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.channel.wallet; +package cn.bootx.platform.daxpay.service.dto.channel.wallet; import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; @@ -30,7 +30,7 @@ public class WalletConfigDto extends BaseDto { @Schema(description = "状态") private String state; - + @Schema(description = "备注") private String remark; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletDto.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletDto.java index 627ba9315..1346ec5c5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.channel.wallet; +package cn.bootx.platform.daxpay.service.dto.channel.wallet; 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/dto/channel/wallet/WalletInfoDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletInfoDto.java similarity index 88% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletInfoDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletInfoDto.java index 804ad7557..7cfb309f2 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletInfoDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletInfoDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.channel.wallet; +package cn.bootx.platform.daxpay.service.dto.channel.wallet; 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/dto/channel/wallet/WalletLogDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletLogDto.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletLogDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletLogDto.java index 3b4665515..d1c4c7a0d 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletLogDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletLogDto.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.dto.channel.wallet; +package cn.bootx.platform.daxpay.service.dto.channel.wallet; import cn.bootx.platform.common.core.rest.dto.BaseDto; -import cn.bootx.platform.daxpay.code.WalletCode; +import cn.bootx.platform.daxpay.service.code.WalletCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,7 +30,7 @@ public class WalletLogDto extends BaseDto implements Serializable { private Long userId; /** - * @see cn.bootx.platform.daxpay.code.WalletCode + * @see WalletCode */ @Schema(description = "类型") private String type; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java similarity index 80% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPayOrderDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java index 5a62980ea..60a5743cb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletPayOrderDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.dto.channel.wallet; +package cn.bootx.platform.daxpay.service.dto.channel.wallet; -import cn.bootx.platform.daxpay.dto.order.pay.PayOrderDto; +import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayConfigDto.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayConfigDto.java index ddef3b425..fd17e5b81 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayConfigDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayConfigDto.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.dto.channel.wechat; +package cn.bootx.platform.daxpay.service.dto.channel.wechat; import cn.bootx.platform.common.core.rest.dto.BaseDto; -import cn.bootx.platform.daxpay.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; 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/dto/channel/wechat/WeChatPayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayOrderDto.java similarity index 81% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayOrderDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayOrderDto.java index a62dd21c6..e19f8276c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/channel/wechat/WeChatPayOrderDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayOrderDto.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.dto.channel.wechat; +package cn.bootx.platform.daxpay.service.dto.channel.wechat; -import cn.bootx.platform.daxpay.dto.order.pay.PayOrderDto; +import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/pay/PayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java similarity index 95% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/pay/PayOrderDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java index 583b62c0f..845a1b481 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/pay/PayOrderDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/pay/PayOrderDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.order.pay; +package cn.bootx.platform.daxpay.service.dto.order.pay; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.bootx.platform.daxpay.code.PayStatusEnum; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/refund/PayRefundOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/refund/PayRefundOrderDto.java similarity index 92% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/refund/PayRefundOrderDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/refund/PayRefundOrderDto.java index 959236beb..aeeca41cc 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/refund/PayRefundOrderDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/refund/PayRefundOrderDto.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.dto.order.refund; +package cn.bootx.platform.daxpay.service.dto.order.refund; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.bootx.platform.daxpay.code.PayRefundStatusEnum; -import cn.bootx.platform.daxpay.common.entity.OrderRefundableInfo; +import cn.bootx.platform.daxpay.service.common.entity.OrderRefundableInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/sync/PaySyncRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/sync/PaySyncRecordDto.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/sync/PaySyncRecordDto.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/sync/PaySyncRecordDto.java index d5b17c5e6..0808d2c04 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/dto/order/sync/PaySyncRecordDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/order/sync/PaySyncRecordDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.dto.order.sync; +package cn.bootx.platform.daxpay.service.dto.order.sync; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.bootx.platform.daxpay.code.PayChannelEnum; @@ -26,10 +26,10 @@ public class PaySyncRecordDto extends BaseDto { private Long paymentId; /** - * 支付渠道 + * 支付通道 * @see PayChannelEnum#getCode() */ - @Schema(description = "支付渠道") + @Schema(description = "支付通道") private String channel; /** 通知消息 */ 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/PayApiConfigDto.java new file mode 100644 index 000000000..dd3f64c37 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PayApiConfigDto.java @@ -0,0 +1,50 @@ +package cn.bootx.platform.daxpay.service.dto.system; + +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/2 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@Schema(title = "支付接口管理") +public class PayApiConfigDto extends BaseDto { + + @Schema(description = "编码") + private String code; + + @Schema(description = "接口地址") + private String api; + + @Schema(description = "名称") + private String name; + + @Schema(description = "是否启用") + private boolean enable; + + @Schema(description = "是否开启回调通知") + private boolean notice; + + @Schema(description = "默认回调地址") + private String noticeUrl; + + @Schema(description = "请求参数是否签名") + private boolean reqSign; + + @Schema(description = "响应参数是否签名") + private boolean resSign; + + @Schema(description = "回调信息是否签名") + private boolean noticeSign; + + @Schema(description = "是否记录请求的信息") + private boolean record; + +} 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/PlatformConfigDto.java new file mode 100644 index 000000000..52cd1bbd4 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/PlatformConfigDto.java @@ -0,0 +1,36 @@ +package cn.bootx.platform.daxpay.service.dto.system; + +import cn.bootx.platform.daxpay.code.PaySignTypeEnum; +import cn.bootx.table.modify.annotation.DbColumn; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 平台配置 + * @author xxm + * @since 2024/1/2 + */ +@Data +@Accessors(chain = true) +@Schema(title = "平台配置") +public class PlatformConfigDto { + + @DbColumn(comment = "网站地址") + private String websiteUrl; + + /** + * @see PaySignTypeEnum + */ + @DbColumn(comment = "签名方式") + private String signType; + + @DbColumn(comment = "签名秘钥") + private String signSecret; + + @DbColumn(comment = "支付通知地址") + private String notifyUrl; + + @DbColumn(comment = "订单默认超时时间") + private Integer orderTimeout; +} 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/WechatNoticeConfigDto.java new file mode 100644 index 000000000..dc0d5547d --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/system/WechatNoticeConfigDto.java @@ -0,0 +1,16 @@ +package cn.bootx.platform.daxpay.service.dto.system; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 微信消息通知相关配置 + * @author xxm + * @since 2024/1/2 + */ +@Data +@Accessors(chain = true) +@Schema(title = "微信消息通知相关配置") +public class WechatNoticeConfigDto { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayCallbackStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayCallbackStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java index 46ebf130e..f28caf08a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayCallbackStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCallbackStrategy.java @@ -1,12 +1,12 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; import cn.bootx.platform.common.redis.RedisClient; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.common.local.PaymentContextLocal; -import cn.bootx.platform.daxpay.core.record.callback.dao.CallbackRecordManager; -import cn.bootx.platform.daxpay.core.record.callback.entity.CallbackRecord; -import cn.bootx.platform.daxpay.core.payment.callback.result.PayCallbackResult; -import cn.bootx.platform.daxpay.core.payment.callback.service.PayCallbackService; +import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; +import cn.bootx.platform.daxpay.service.core.record.callback.dao.CallbackRecordManager; +import cn.bootx.platform.daxpay.service.core.record.callback.entity.CallbackRecord; +import cn.bootx.platform.daxpay.service.core.payment.callback.result.PayCallbackResult; +import cn.bootx.platform.daxpay.service.core.payment.callback.service.PayCallbackService; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCloseStrategy.java similarity index 76% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayCloseStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCloseStrategy.java index c3e7b8ca1..e6eebf64a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayCloseStrategy.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; -import cn.bootx.platform.daxpay.common.exception.ExceptionInfo; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import lombok.Getter; import lombok.Setter; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayRefundStrategy.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayRefundStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayRefundStrategy.java index c592c89a1..d59ebdc39 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayRefundStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.common.exception.ExceptionInfo; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; import cn.bootx.platform.daxpay.param.pay.RefundParam; import lombok.Getter; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayRepairStrategy.java similarity index 78% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayRepairStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayRepairStrategy.java index 840db52ad..d281fd4af 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayRepairStrategy.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; -import cn.bootx.platform.daxpay.code.PayRepairSourceEnum; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import lombok.Getter; import lombok.Setter; @@ -49,6 +49,13 @@ public abstract class AbsPayRepairStrategy { */ public abstract void doCloseHandler(); + /** + * 订单支付超时取消支付 + */ + public void doTimeoutHandler() { + + } + /** * 退款处理 todo 需要结合退款同步功能进行协同实现 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java index 6e3be18db..f5e53b4d1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.common.exception.ExceptionInfo; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import cn.bootx.platform.daxpay.param.pay.PayParam; import cn.bootx.platform.daxpay.param.pay.PayWayParam; import lombok.Getter; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPaySyncStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPaySyncStrategy.java similarity index 74% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPaySyncStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPaySyncStrategy.java index 93953b72c..6cf641ee8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/AbsPaySyncStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPaySyncStrategy.java @@ -1,8 +1,8 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; -import cn.bootx.platform.daxpay.core.payment.sync.result.GatewaySyncResult; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.payment.sync.result.GatewaySyncResult; import lombok.Getter; import lombok.Setter; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/PayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/PayStrategy.java similarity index 70% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/PayStrategy.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/PayStrategy.java index ee4ddc8ff..02c458d09 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/PayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/PayStrategy.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; /** * 支付相关策略标识接口 diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/PayStrategyConsumer.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/PayStrategyConsumer.java similarity index 73% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/PayStrategyConsumer.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/PayStrategyConsumer.java index 1e04194ec..3ce2b99a4 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/func/PayStrategyConsumer.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/PayStrategyConsumer.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.func; +package cn.bootx.platform.daxpay.service.func; -import cn.bootx.platform.daxpay.core.record.pay.entity.PayOrder; +import cn.bootx.platform.daxpay.service.core.record.pay.entity.PayOrder; import java.util.List; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/alipay/AliPayConfigParam.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/alipay/AliPayConfigParam.java index 2372e8bce..205dec32a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AliPayConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/alipay/AliPayConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.alipay; +package cn.bootx.platform.daxpay.service.param.channel.alipay; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -15,9 +15,6 @@ import java.util.List; @Schema(title = "支付宝配置参数") public class AliPayConfigParam { - @Schema(description = "名称") - private String name; - @Schema(description = "支付宝商户appId") private String appId; @@ -55,13 +52,13 @@ public class AliPayConfigParam { private Integer expireTime; @Schema(description = "可用支付方式") - private List payWayList; + private List payWays; @Schema(description = "是否沙箱环境") private boolean sandbox; @Schema(description = "状态") - private String state; + private String status; @Schema(description = "备注") private String remark; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/alipay/AlipayConfigQuery.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/alipay/AlipayConfigQuery.java index 94cbf0e9a..6297ca360 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/alipay/AlipayConfigQuery.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/alipay/AlipayConfigQuery.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.alipay; +package cn.bootx.platform.daxpay.service.param.channel.alipay; 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/param/channel/voucher/VoucherImportParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/voucher/VoucherImportParam.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherImportParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/voucher/VoucherImportParam.java index 87e3e3dc2..43fa452d8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherImportParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/voucher/VoucherImportParam.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.param.channel.voucher; +package cn.bootx.platform.daxpay.service.param.channel.voucher; -import cn.bootx.platform.daxpay.code.VoucherCode; +import cn.bootx.platform.daxpay.service.code.VoucherCode; import cn.hutool.core.date.DatePattern; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/voucher/VoucherParam.java similarity index 90% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/voucher/VoucherParam.java index d7767108b..884eaec7c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/voucher/VoucherParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/voucher/VoucherParam.java @@ -1,6 +1,6 @@ -package cn.bootx.platform.daxpay.param.channel.voucher; +package cn.bootx.platform.daxpay.service.param.channel.voucher; -import cn.bootx.platform.daxpay.code.VoucherCode; +import cn.bootx.platform.daxpay.service.code.VoucherCode; import cn.hutool.core.date.DatePattern; 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/param/channel/wallet/WalletLogQueryParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletLogQueryParam.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletLogQueryParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletLogQueryParam.java index 43867ec4f..cad467e74 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletLogQueryParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletLogQueryParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wallet; +package cn.bootx.platform.daxpay.service.param.channel.wallet; 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/param/channel/wallet/WalletPayParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletPayParam.java similarity index 89% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletPayParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletPayParam.java index 8b86502ac..ba1f04c30 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletPayParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletPayParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wallet; +package cn.bootx.platform.daxpay.service.param.channel.wallet; 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/param/channel/wallet/WalletQueryParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletQueryParam.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletQueryParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletQueryParam.java index b95d08925..1f17a7b24 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletQueryParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletQueryParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wallet; +package cn.bootx.platform.daxpay.service.param.channel.wallet; import cn.bootx.platform.common.core.annotation.QueryParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletRechargeParam.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletRechargeParam.java index bed85a09b..c125d62a5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRechargeParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletRechargeParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wallet; +package cn.bootx.platform.daxpay.service.param.channel.wallet; 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/param/channel/wallet/WalletRefundParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletRefundParam.java similarity index 81% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRefundParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletRefundParam.java index 02ab736a2..9e113b8cc 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wallet/WalletRefundParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wallet/WalletRefundParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wallet; +package cn.bootx.platform.daxpay.service.param.channel.wallet; 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/param/channel/wechat/WalletConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WalletConfigParam.java similarity index 91% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WalletConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WalletConfigParam.java index 2bccd2932..4b473ef4e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WalletConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WalletConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wechat; +package cn.bootx.platform.daxpay.service.param.channel.wechat; 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/param/channel/wechat/WeChatPayConfigParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayConfigParam.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayConfigParam.java index 705f18a70..c1ecf5e1a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayConfigParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayConfigParam.java @@ -1,7 +1,7 @@ -package cn.bootx.platform.daxpay.param.channel.wechat; +package cn.bootx.platform.daxpay.service.param.channel.wechat; import cn.bootx.platform.common.core.annotation.QueryParam; -import cn.bootx.platform.daxpay.code.WeChatPayCode; +import cn.bootx.platform.daxpay.service.code.WeChatPayCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayParam.java similarity index 87% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayParam.java index 4040e34fa..fba317bae 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/channel/wechat/WeChatPayParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.channel.wechat; +package cn.bootx.platform.daxpay.service.param.channel.wechat; 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/param/openapi/PayOpenApiInfoParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PayApiConfigParam.java similarity index 85% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/openapi/PayOpenApiInfoParam.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PayApiConfigParam.java index 22cead9ef..f2d89b8e7 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/param/openapi/PayOpenApiInfoParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PayApiConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.openapi; +package cn.bootx.platform.daxpay.service.param.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -12,7 +12,10 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @Schema(title = "支付开放接口管理") -public class PayOpenApiInfoParam { +public class PayApiConfigParam { + + @Schema(description = "id") + private Long id; @Schema(description = "是否启用") private boolean enable; 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/PlatformConfigParam.java new file mode 100644 index 000000000..3bec85369 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/PlatformConfigParam.java @@ -0,0 +1,36 @@ +package cn.bootx.platform.daxpay.service.param.system; + +import cn.bootx.platform.daxpay.code.PaySignTypeEnum; +import cn.bootx.table.modify.annotation.DbColumn; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 平台配置 + * @author xxm + * @since 2024/1/2 + */ +@Data +@Accessors(chain = true) +@Schema(title = "平台配置") +public class PlatformConfigParam { + + @DbColumn(comment = "网站地址") + private String websiteUrl; + + /** + * @see PaySignTypeEnum + */ + @DbColumn(comment = "签名方式") + private String signType; + + @DbColumn(comment = "签名秘钥") + private String signSecret; + + @DbColumn(comment = "支付通知地址") + private String notifyUrl; + + @DbColumn(comment = "订单默认超时时间") + private Integer orderTimeout; +} 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/WechatNoticeConfigParam.java new file mode 100644 index 000000000..814418f75 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/system/WechatNoticeConfigParam.java @@ -0,0 +1,16 @@ +package cn.bootx.platform.daxpay.service.param.system; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 微信消息通知相关配置 + * @author xxm + * @since 2024/1/2 + */ +@Data +@Accessors(chain = true) +@Schema(title = "微信消息通知相关配置") +public class WechatNoticeConfigParam { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/util/PayChannelUtil.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/util/PayChannelUtil.java similarity index 86% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/util/PayChannelUtil.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/util/PayChannelUtil.java index 9dbbb91ad..34df6abe8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/util/PayChannelUtil.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/util/PayChannelUtil.java @@ -1,10 +1,10 @@ -package cn.bootx.platform.daxpay.util; +package cn.bootx.platform.daxpay.service.util; import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.code.PayWayExtraCode; +import cn.bootx.platform.daxpay.service.code.PayWayExtraCode; import cn.bootx.platform.daxpay.param.channel.AliPayParam; -import cn.bootx.platform.daxpay.param.channel.wallet.WalletPayParam; -import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayParam; +import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletPayParam; +import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayParam; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -23,7 +23,7 @@ public class PayChannelUtil { /** * 构建扩展参数构建 - * @param payChannel 支付渠道编码 + * @param payChannel 支付通道编码 * @param map 支付方式扩展字段信息 key 为 PayModelExtraCode中定义的 */ public String buildExtraParamsJson(String payChannel, Map map) { diff --git a/daxpay-single/daxpay-single-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-single/daxpay-single-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index da3a0c28f..3527963df 100644 --- a/daxpay-single/daxpay-single-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/daxpay-single/daxpay-single-service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.platform.daxpay.DaxpaySingleServiceApp +cn.bootx.platform.daxpay.service.DaxpaySingleServiceApp diff --git a/daxpay-single/daxpay-single-start/src/main/java/cn/bootx/platform/daxpay/DaxpaySingleStart.java b/daxpay-single/daxpay-single-start/src/main/java/cn/bootx/platform/daxpay/start/DaxpaySingleStart.java similarity index 97% rename from daxpay-single/daxpay-single-start/src/main/java/cn/bootx/platform/daxpay/DaxpaySingleStart.java rename to daxpay-single/daxpay-single-start/src/main/java/cn/bootx/platform/daxpay/start/DaxpaySingleStart.java index 210360ecb..ec99423f8 100644 --- a/daxpay-single/daxpay-single-start/src/main/java/cn/bootx/platform/daxpay/DaxpaySingleStart.java +++ b/daxpay-single/daxpay-single-start/src/main/java/cn/bootx/platform/daxpay/start/DaxpaySingleStart.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay; +package cn.bootx.platform.daxpay.start; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; diff --git a/daxpay-single/daxpay-single-start/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-single/daxpay-single-start/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b9b464d23..1020842b0 100644 --- a/daxpay-single/daxpay-single-start/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/daxpay-single/daxpay-single-start/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.platform.daxpay.DaxPaySingleAdminApp +cn.bootx.platform.daxpay.start.DaxpaySingleStart diff --git a/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml b/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml index 806b3e24c..00cfc9509 100644 --- a/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml +++ b/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml @@ -49,12 +49,6 @@ spring: static-locations: classpath:/static/,classpath:/public/ thymeleaf: cache: false - # 数据库版本管理 - flyway: - # 如果 flyway_schema_history 不存在自动创建 - baseline-on-migrate: true - # 开发模式开启 - enabled: true # 定时任务 quartz: # 持久化方式 @@ -77,6 +71,7 @@ spring: logging: level: cn.bootx.**: debug + org.springframework.jdbc.core: debug # 项目配置 bootx: common: @@ -84,27 +79,19 @@ bootx: swagger: enabled: true author: bootx - version: 1.2.3 - title: bootx开发平台单体版 - description: bootx-platform开发平台单体版 + version: 2.0.0 + title: 开源支付平台-单商户 + description: 开源支付平台-单商户版 # 多模块扫码 base-packages: - "[支付服务]": cn.bootx.platform.daxpay - "[基础API]": cn.bootx.platform.baseapi - "[身份识别和管理]": cn.bootx.platform.iam - "[消息服务]": cn.bootx.platform.notice - "[第三方对接]": - - cn.bootx.platform.starter.dingtalk - - cn.bootx.platform.starter.wecom - - cn.bootx.platform.starter.wechat - "[认证与权限]": - - cn.bootx.platform.starter.auth - - cn.bootx.platform.starter.data.perm - "[其他starter组件]": - - cn.bootx.platform.starter.audit.log - - cn.bootx.platform.starter.file - - cn.bootx.platform.starter.quartz - - cn.bootx.platform.starter.monitor + "[支付网关API]": cn.bootx.platform.daxpay.gateway + "[支付管理接口]": cn.bootx.platform.daxpay.admin + "[BootxPlatform接口]": + - cn.bootx.platform.common + - cn.bootx.platform.starter + - cn.bootx.platform.iam + - cn.bootx.platform.baseapi + - cn.bootx.platform.notice # 缓存 cache: # 默认超时时间 30分钟 @@ -134,7 +121,6 @@ bootx: - '/ws/**' - '/demo/**' - '/test/**' - - "/plumelog/**" - '/webjars/**' - '/css/**' - '/error' @@ -154,3 +140,9 @@ bootx: data-perm: # 需要符合AES密钥的要求 field-decrypt-key: "UCrtxSCwYZNCIlav" +# 自动建表 +table-modify: + update-type: update + database-type: mysql + fail-fast: true + scan-package: cn.bootx.platform.daxpay diff --git a/daxpay-single/daxpay-single-start/src/main/resources/application.yml b/daxpay-single/daxpay-single-start/src/main/resources/application.yml index a02bafa5b..a50cda5d0 100644 --- a/daxpay-single/daxpay-single-start/src/main/resources/application.yml +++ b/daxpay-single/daxpay-single-start/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: profiles: active: dev config: -# use-legacy-processing: true + use-legacy-processing: true activate: on-profile: dev servlet: @@ -14,11 +14,6 @@ spring: enabled: true thymeleaf: mode: LEGACYHTML5 - flyway: - # 默认不启用 - enabled: false - # 对特殊占位符不进行替换 - placeholder-replacement: false # mp配置 mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml diff --git a/daxpay-single/daxpay-single-start/src/main/resources/logback-spring.xml b/daxpay-single/daxpay-single-start/src/main/resources/logback-spring.xml index 559899542..0a118bab2 100644 --- a/daxpay-single/daxpay-single-start/src/main/resources/logback-spring.xml +++ b/daxpay-single/daxpay-single-start/src/main/resources/logback-spring.xml @@ -12,10 +12,10 @@ - - ${appname} - 127.0.0.1 - + + + + diff --git a/pom.xml b/pom.xml index 17bb86659..0702e101a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,11 @@ 2.0.0 1.7.30 - 1.4.01 0.0.38 3.5.2 - 2.9.8 - 4.0.0 + 2.9.10 + 4.4.0 1.5.3.Final 0.2.0 1.5.4