From 0f2031d0db1716ad14d59118178e48e684dfeb47 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 23 Jan 2022 13:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Pay=20=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 ++++++++++++++++- sql/change_db.sql | 8 -------- .../pay/controller/app/PayAppController.java | 2 +- .../channel/PayChannelController.java | 2 +- .../merchant/PayMerchantController.java | 2 +- yudao-admin-ui/src/views/pay/order/index.vue | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 sql/change_db.sql diff --git a/README.md b/README.md index 5904f1f35..fd9abe50b 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ * 支持加载动态权限菜单，多方式轻松权限控制，本地缓存提升性能。 * 工作流使用 Activiti ，支持动态表单、在线设计流程、多种任务分配方式。 * 高效率开发，使用代码生成器可以一键生成前后端代码 + 单元测试 + Swagger 接口文档。 +* 集成微信小程序、微信公众号、企业微信等多种第三方授权登录，集成支付宝、微信等多种支付方式。 ## 在线体验 @@ -69,7 +70,14 @@ ### 支付系统 -正在测试中，核心功能已经开发完毕。 +| | 功能 | 描述 | +| --- | --- | --- | +| 🚀 | 商户信息 | 管理商户信息，支持 Saas 场景下的多商户功能 | +| 🚀 | 应用信息 | 配置商户的应用信息，对接支付宝、微信等多个支付渠道 | +| 🚀 | 支付订单 | 查看用户在支付宝、微信等的【支付】订单 | +| 🚀 | 退款订单 | 查看用户在支付宝、微信等的【退款】订单 | + +ps：核心功能已经实现，正在对接微信小程序中... ### 基础设施 @@ -172,6 +180,13 @@ | 待办 & 已办 | ![任务列表-审批](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-审批.jpg) | ![任务列表-待办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-待办.jpg) | ![任务列表-已办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-已办.jpg) | | OA 请假 | ![OA请假-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-列表.jpg) | ![OA请假-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-发起.jpg) | ![OA请假-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-详情.jpg) | +### 支付系统 + +| 模块 | biu | biu | biu | +| --- | --- | --- | --- | +| 商家 & 应用 | ![商户信息](https://static.iocoder.cn/images/ruoyi-vue-pro/商户信息.jpg) | ![应用信息-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-列表.jpg) | ![应用信息-编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-编辑.jpg) | +| 支付 & 退款 | ![支付订单](https://static.iocoder.cn/images/ruoyi-vue-pro/支付订单jpg) | ![退款订单](https://static.iocoder.cn/images/ruoyi-vue-pro/退款订单jpg) | --- | + ### 基础设施 | 模块 | biu | biu | biu | diff --git a/sql/change_db.sql b/sql/change_db.sql deleted file mode 100644 index 810183f3e..000000000 --- a/sql/change_db.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE `ruoyi-vue-pro`.`pay_order_extension` -CHANGE COLUMN `channel_notify_data` `channel_notify_data` VARCHAR(2048) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL COMMENT '支付渠道异步通知的内容' ; - -ALTER TABLE `ruoyi-vue-pro`.`pay_refund` -CHANGE COLUMN `req_no` `req_no` VARCHAR(64) NULL COMMENT '退款单请求号' ; - -ALTER TABLE `ruoyi-vue-pro`.`pay_refund` -DROP COLUMN `req_no`; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/PayAppController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/PayAppController.java index 56d8ffb19..344624392 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/PayAppController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/PayAppController.java @@ -71,7 +71,7 @@ public class PayAppController { @DeleteMapping("/delete") @ApiOperation("删除支付应用信息") - @ApiImplicitParam(name = "id", value = "编号", required = true) + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('pay:app:delete')") public CommonResult deleteApp(@RequestParam("id") Long id) { appService.deleteApp(id); diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/channel/PayChannelController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/channel/PayChannelController.java index 2b1d468f8..ae83ef9cc 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/channel/PayChannelController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/channel/PayChannelController.java @@ -57,7 +57,7 @@ public class PayChannelController { @DeleteMapping("/delete") @ApiOperation("删除支付渠道 ") - @ApiImplicitParam(name = "id", value = "编号", required = true) + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('pay:channel:delete')") public CommonResult deleteChannel(@RequestParam("id") Long id) { channelService.deleteChannel(id); diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/merchant/PayMerchantController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/merchant/PayMerchantController.java index b581e99ff..ae0235efc 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/merchant/PayMerchantController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/merchant/PayMerchantController.java @@ -59,7 +59,7 @@ public class PayMerchantController { @DeleteMapping("/delete") @ApiOperation("删除支付商户信息") - @ApiImplicitParam(name = "id", value = "编号", required = true) + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) @PreAuthorize("@ss.hasPermission('pay:merchant:delete')") public CommonResult deleteMerchant(@RequestParam("id") Long id) { merchantService.deleteMerchant(id); diff --git a/yudao-admin-ui/src/views/pay/order/index.vue b/yudao-admin-ui/src/views/pay/order/index.vue index cb77d1dd2..7998c6c76 100755 --- a/yudao-admin-ui/src/views/pay/order/index.vue +++ b/yudao-admin-ui/src/views/pay/order/index.vue @@ -109,7 +109,7 @@ - +