完善骑手提现菜单图标初始化与回填逻辑，新增余额接口冻结余额返回字段

shaofan
1 parent c05eb941
Showing 4 changed files with 10 additions and 2 deletions
src/main/java/com/diligrp/rider/service/impl/RiderBalanceServiceImpl.java
src/main/java/com/diligrp/rider/vo/BalanceVO.java
src/main/resources/20260509-rider-withdraw.sql
src/main/resources/data-init.sql
@@ -56,6 +56,7 @@ public class RiderBalanceServiceImpl implements RiderBalanceService {
  
         BalanceVO vo = new BalanceVO();
         vo.setBalance(rider.getBalance());
+        vo.setFrozenBalance(rider.getFrozenBalance());
         vo.setRecords(recordVOs);
         return vo;
     }
@@ -9,6 +9,8 @@ import java.util.List;
 public class BalanceVO {
     /** 当前余额 */
     private BigDecimal balance;
+    /** 冻结余额（提现审核中） */
+    private BigDecimal frozenBalance;
     /** 流水列表 */
     private List<BalanceRecordVO> records;
  
@@ -33,9 +33,14 @@ CREATE TABLE `rider_withdraw_apply` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='骑手提现申请表';
  
 INSERT INTO `sys_menu` (`code`, `name`, `type`, `path`, `icon`, `parent_id`, `menu_scope`, `list_order`, `visible`, `status`, `create_time`)
-SELECT 'rider.withdraw', '骑手提现审核', 'MENU', '/rider/withdraw', '', 0, 'BOTH', 56, 1, 1, UNIX_TIMESTAMP()
+SELECT 'rider.withdraw', '骑手提现审核', 'MENU', '/rider/withdraw', 'WalletOutlined', 0, 'BOTH', 56, 1, 1, UNIX_TIMESTAMP()
 WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `code` = 'rider.withdraw');
  
+UPDATE `sys_menu`
+SET `icon` = 'WalletOutlined'
+WHERE `code` = 'rider.withdraw'
+  AND (`icon` IS NULL OR `icon` = '');
+
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`, `create_time`)
 SELECT r.id, m.id, UNIX_TIMESTAMP()
 FROM `sys_role` r
@@ -91,7 +91,7 @@ INSERT INTO `sys_menu` (`code`, `name`, `type`, `path`, `icon`, `parent_id`, `me
 ('system.menu', '菜单管理', 'MENU', '/system/menu', '', 19, 'PLATFORM', 101, 1, 1, UNIX_TIMESTAMP()),
 ('system.role_menu', '角色菜单', 'MENU', '/system/role-menu', '', 19, 'PLATFORM', 102, 1, 1, UNIX_TIMESTAMP()),
 ('admin.user', '平台账号', 'MENU', '/admin-user', '', 19, 'PLATFORM', 103, 1, 1, UNIX_TIMESTAMP()),
-('rider.withdraw', '骑手提现审核', 'MENU', '/rider/withdraw', '', 0, 'BOTH', 56, 1, 1, UNIX_TIMESTAMP());
+('rider.withdraw', '骑手提现审核', 'MENU', '/rider/withdraw', 'WalletOutlined', 0, 'BOTH', 56, 1, 1, UNIX_TIMESTAMP());
  
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`, `create_time`)
 SELECT 1, id, UNIX_TIMESTAMP() FROM `sys_menu` WHERE `menu_scope` IN ('PLATFORM', 'BOTH');