Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

YunaiV
2 parents 1ff9bc6a 34210d35
Showing 2 changed files with 29 additions and 3 deletions
sql/mysql/pay_wallet.sql
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java
@@ -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
+       );
+
@@ -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;
 }