From 7d0bcf5d3b5643df167aa9d751b093501dbae1b7 Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Mon, 16 Oct 2023 22:43:39 +0800 Subject: [PATCH] =?UTF-8?q?wallet=20-=20=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=E9=92=B1=E5=8C=85=E4=BD=99=E9=A2=9D=E8=8F=9C=E5=8D=95=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/pay_wallet.sql | 29 +++++++++++++++++-- .../PayWalletTransactionRespVO.java | 3 ++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/sql/mysql/pay_wallet.sql b/sql/mysql/pay_wallet.sql index 84b55d3bd..28b737d3c 100644 --- a/sql/mysql/pay_wallet.sql +++ b/sql/mysql/pay_wallet.sql @@ -126,7 +126,7 @@ CREATE TABLE `pay_wallet_recharge` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '会员钱包充值' ROW_FORMAT = Dynamic; --- 钱包充值套餐菜单脚本 +-- 钱包充值套餐,钱包余额菜单脚本 INSERT INTO system_menu( name, permission, type, sort, parent_id, @@ -136,13 +136,14 @@ VALUES ( '钱包管理', '', 1, 5, 1117, 'wallet', 'ep:caret-right', '', 0, '' ); -SELECT @parentId := LAST_INSERT_ID(); +SELECT @parentId1 := LAST_INSERT_ID(); + INSERT INTO system_menu( name, permission, type, sort, parent_id, path, icon, component, status, component_name ) VALUES ( - '充值套餐', '', 2, 2, @parentId, + '充值套餐', '', 2, 2, @parentId1, 'wallet-recharge-package', 'fa:leaf', 'pay/wallet/rechargePackage/index', 0, 'WalletRechargePackage' ); SELECT @parentId := LAST_INSERT_ID(); @@ -180,3 +181,25 @@ VALUES ( '钱包充值套餐删除', 'pay:wallet-recharge-package:delete', 3, 4, @parentId, '', '', '', 0 ); + +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '钱包余额', '', 2, 1, @parentId1, + 'wallet-balance', 'fa:leaf', 'pay/wallet/balance/index', 0, 'WalletBalance' + ); + +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '钱包余额查询', 'pay:wallet:query', 3, 1, @parentId, + '', '', '', 0 + ); + diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java index d82dfaab0..de6338318 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java @@ -24,6 +24,9 @@ public class PayWalletTransactionRespVO { @Schema(description = "流水标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "土豆土豆") private String title; + @Schema(description = "交易后的余额,单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long balance; + @Schema(description = "交易时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; }