microservice / rider-service · Commits

Commit 2449a3c0f97077d30c094848080f89c4ba6708d8

Authored by shaofan
1 parent c05eb941
build: skipped

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

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