Commit a6fbbc7172f1b1160754bf76367a2989169304f5
Committed by
Gitee
Gitee
!68 新增支付后台相关的 README 的更新
Merge pull request !68 from 芋道源码/pay_extension
Showing
6 changed files
with
20 additions
and
13 deletions
README.md
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | * 支持加载动态权限菜单，多方式轻松权限控制，本地缓存提升性能。 |
| 11 | 11 | * 工作流使用 Activiti ，支持动态表单、在线设计流程、多种任务分配方式。 |
| 12 | 12 | * 高效率开发，使用代码生成器可以一键生成前后端代码 + 单元测试 + Swagger 接口文档。 |
| 13 | +* 集成微信小程序、微信公众号、企业微信等多种第三方授权登录，集成支付宝、微信等多种支付方式。 | |
| 13 | 14 | |
| 14 | 15 | ## 在线体验 |
| 15 | 16 | |
| ... | ... | @@ -69,7 +70,14 @@ |
| 69 | 70 | |
| 70 | 71 | ### 支付系统 |
| 71 | 72 | |
| 72 | -正在测试中，核心功能已经开发完毕。 | |
| 73 | +| | 功能 | 描述 | | |
| 74 | +| --- | --- | --- | | |
| 75 | +| 🚀 | 商户信息 | 管理商户信息，支持 Saas 场景下的多商户功能 | | |
| 76 | +| 🚀 | 应用信息 | 配置商户的应用信息，对接支付宝、微信等多个支付渠道 | | |
| 77 | +| 🚀 | 支付订单 | 查看用户在支付宝、微信等的【支付】订单 | | |
| 78 | +| 🚀 | 退款订单 | 查看用户在支付宝、微信等的【退款】订单 | | |
| 79 | + | |
| 80 | +ps：核心功能已经实现，正在对接微信小程序中... | |
| 73 | 81 | |
| 74 | 82 | ### 基础设施 |
| 75 | 83 | |
| ... | ... | @@ -172,6 +180,13 @@ |
| 172 | 180 | | 待办 & 已办 |  |  |  | |
| 173 | 181 | | OA 请假 |  |  |  | |
| 174 | 182 | |
| 183 | +### 支付系统 | |
| 184 | + | |
| 185 | +| 模块 | biu | biu | biu | | |
| 186 | +| --- | --- | --- | --- | | |
| 187 | +| 商家 & 应用 |  |  |  | | |
| 188 | +| 支付 & 退款 |  |  | --- | | |
| 189 | + | |
| 175 | 190 | ### 基础设施 |
| 176 | 191 | |
| 177 | 192 | | 模块 | biu | biu | biu | | ... | ... |
sql/change_db.sql deleted
| 1 | -ALTER TABLE `ruoyi-vue-pro`.`pay_order_extension` | |
| 2 | -CHANGE COLUMN `channel_notify_data` `channel_notify_data` VARCHAR(2048) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL COMMENT '支付渠道异步通知的内容' ; | |
| 3 | - | |
| 4 | -ALTER TABLE `ruoyi-vue-pro`.`pay_refund` | |
| 5 | -CHANGE COLUMN `req_no` `req_no` VARCHAR(64) NULL COMMENT '退款单请求号' ; | |
| 6 | - | |
| 7 | -ALTER TABLE `ruoyi-vue-pro`.`pay_refund` | |
| 8 | -DROP COLUMN `req_no`; |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/app/PayAppController.java
| ... | ... | @@ -71,7 +71,7 @@ public class PayAppController { |
| 71 | 71 | |
| 72 | 72 | @DeleteMapping("/delete") |
| 73 | 73 | @ApiOperation("删除支付应用信息") |
| 74 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | |
| 74 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) | |
| 75 | 75 | @PreAuthorize("@ss.hasPermission('pay:app:delete')") |
| 76 | 76 | public CommonResult<Boolean> deleteApp(@RequestParam("id") Long id) { |
| 77 | 77 | appService.deleteApp(id); | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/channel/PayChannelController.java
| ... | ... | @@ -57,7 +57,7 @@ public class PayChannelController { |
| 57 | 57 | |
| 58 | 58 | @DeleteMapping("/delete") |
| 59 | 59 | @ApiOperation("删除支付渠道 ") |
| 60 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | |
| 60 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) | |
| 61 | 61 | @PreAuthorize("@ss.hasPermission('pay:channel:delete')") |
| 62 | 62 | public CommonResult<Boolean> deleteChannel(@RequestParam("id") Long id) { |
| 63 | 63 | channelService.deleteChannel(id); | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/merchant/PayMerchantController.java
| ... | ... | @@ -59,7 +59,7 @@ public class PayMerchantController { |
| 59 | 59 | |
| 60 | 60 | @DeleteMapping("/delete") |
| 61 | 61 | @ApiOperation("删除支付商户信息") |
| 62 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | |
| 62 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) | |
| 63 | 63 | @PreAuthorize("@ss.hasPermission('pay:merchant:delete')") |
| 64 | 64 | public CommonResult<Boolean> deleteMerchant(@RequestParam("id") Long id) { |
| 65 | 65 | merchantService.deleteMerchant(id); | ... | ... |
yudao-admin-ui/src/views/pay/order/index.vue
| ... | ... | @@ -109,7 +109,7 @@ |
| 109 | 109 | </el-popover> |
| 110 | 110 | </template> |
| 111 | 111 | </el-table-column> |
| 112 | - <el-table-column label="支付订单" align="left" width="250"> | |
| 112 | + <el-table-column label="支付订单" align="left" width="280"> | |
| 113 | 113 | <template v-slot="scope"> |
| 114 | 114 | <p class="order-font"><el-tag size="mini">商户</el-tag> {{scope.row.merchantOrderId}}</p> |
| 115 | 115 | <p class="order-font"><el-tag size="mini" type="warning">支付</el-tag> {{scope.row.channelOrderNo}}</p> | ... | ... |