使用impeccable skill 开发和优化页面,之后的页面开发和优化也都使用impeccable ski,1.创建收益结算单,通过勾选租赁订单的方式,不要用输入,要过滤掉已经结算的。2.供应商usdt-ui\src\views\system\rentSettlement\下面新增供应商结算页面,添加结算申请按钮。要求页面美观,交互友好
This commit is contained in:
1 parent
be6ac23844
commit
611e020f38
6 files changed
+327
-1
No files matched your search
@@ -2,7 +2,22 @@
|
||||
|
||||
## 资金流程
|
||||
|
||||
履约成功且收入已确认 → 管理员创建收益结算单 → 另一管理员审核 → 待结算收益转入可用余额 → 供应商申请提现 → 冻结金额 → 管理员或Telegram审核 → 执行付款 → 人工登记并核验或自动扫描匹配 → 扣除冻结金额。
|
||||
履约成功且收入已确认 → 供应商或管理员勾选订单申请收益结算 → 独立管理员审核 → 待结算收益转入可用余额 → 供应商申请提现 → 冻结金额 → 管理员或Telegram审核 → 执行付款 → 人工登记并核验或自动扫描匹配 → 扣除冻结金额。
|
||||
|
||||
## 页面与权限
|
||||
|
||||
管理员:原“供应商结算”页面,先选网络及供应商账户,再勾选订单创建收益结算单;保留新单审核及旧单付款核对操作。
|
||||
|
||||
供应商:`system/rentSettlement/user/index`,菜单“我的收益结算”,默认路径为父目录下的 `supplier-settlement`。执行 `sql/rent_supplier_settlement_menu.sql` 后重新登录刷新权限。该脚本兼容rental/proxyRent目录,只授予PROXY_SUPPLIER本人查看和申请权限,不授予管理或审批权限。
|
||||
|
||||
两个页面共享订单选择器,过滤SUCCESS、CHARGED、净收益大于0且无有效结算占用的订单。申请中和已入账来源均不出现;拒绝释放后重新出现。金额以六位最小单位字符串精确求和,最终金额仍由服务端加锁计算。切换网络、账户、搜索或分页会清空勾选,避免提交不可见选择。支持订单号/接收地址搜索、分页、来源详情、错误重试与空状态引导。
|
||||
|
||||
- `GET /rental/settlements`:本人结算分页,参数network/status/page;权限 `rent:settlement:view`。
|
||||
- `GET /rental/settlements/candidates`:本人可申请订单,参数network/keyword/page;权限 `rent:settlement:apply`。
|
||||
- `POST /rental/settlements`:本人勾选申请,正文order_ids;权限 `rent:settlement:apply`。不接受user_id指定归属。
|
||||
- `GET /rental/settlements/{id}`:本人结算详情及来源,权限 `rent:settlement:view`。
|
||||
- 管理员分页/详情分别为 `/rental/manage/settlements` 和 `/rental/manage/settlements/{id}`,权限 `rent:manage:list`。
|
||||
- 管理员候选账户 `/rental/manage/settlements/accounts` 参数network/keyword;候选订单 `/rental/manage/settlements/candidates` 参数network/account/keyword/page,权限 `rent:settlement:create`。创建沿用 `/rental/settlement`。
|
||||
|
||||
结算仅做内部划转,提现才对应链上出款。沿用现有提现配置、权限和到账机制,供应商需具备 `rent:withdraw:create` 权限。
|
||||
|
||||
|
||||
@@ -196,6 +196,16 @@ public class RentalReviews {
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public long settlement(List<Long> orderIds, long actor) {
|
||||
return createSettlement(orderIds, actor, null);
|
||||
}
|
||||
|
||||
/** 本人申请入口独立于运营权限;在订单行锁内逐笔核对供应商账户归属。 */
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public long applySettlement(List<Long> orderIds, long user) {
|
||||
return createSettlement(orderIds, user, user);
|
||||
}
|
||||
|
||||
private long createSettlement(List<Long> orderIds, long actor, Long owner) {
|
||||
require(orderIds != null && !orderIds.isEmpty() && orderIds.size() <= 100, "选择1至100笔订单");
|
||||
SortedSet<Long> sorted = new TreeSet<>(orderIds);
|
||||
require(sorted.size() == orderIds.size(), "不能重复选择来源");
|
||||
@@ -203,7 +213,13 @@ public class RentalReviews {
|
||||
Long account = null;
|
||||
BigDecimal total = ZERO;
|
||||
for (long orderId : sorted) {
|
||||
require(orderId > 0, "来源订单编号无效");
|
||||
Map<String, Object> order = store.get("order", orderId, true);
|
||||
if (owner != null) {
|
||||
Map<String, Object> supplier = store.get("account", number(order, "supplier_account_id"), false);
|
||||
require(number(supplier, "user_id") == owner && number(order, "supplier_user_id") == owner,
|
||||
"只能申请本人供应订单的收益结算");
|
||||
}
|
||||
require("CHARGED".equals(text(order, "fund_status")), "来源订单尚未确认收入");
|
||||
require("SUCCESS".equals(text(order, "status")), "仅履约成功订单允许收益结算");
|
||||
require(store.one("SELECT id FROM rent_settlement_item WHERE order_id=? AND active_slot=1", orderId)
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
package com.ruoyi.system.rental;
|
||||
|
||||
import static com.ruoyi.system.rental.RentalValues.*;
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/** 供应商结算工作区。本人申请权限不授予管理员列表、他人来源或审批能力。 */
|
||||
@RestController
|
||||
public class RentalSettlementController {
|
||||
private final RentalSettlements settlements;
|
||||
private final RentalReviews reviews;
|
||||
|
||||
public RentalSettlementController(RentalSettlements settlements, RentalReviews reviews) {
|
||||
this.settlements = settlements;
|
||||
this.reviews = reviews;
|
||||
}
|
||||
|
||||
@GetMapping("/rental/settlements")
|
||||
@PreAuthorize("@ss.hasPermi('rent:settlement:view')")
|
||||
public AjaxResult mine(@RequestParam String network, @RequestParam(defaultValue = "") String status,
|
||||
@RequestParam(defaultValue = "1") int page) {
|
||||
return AjaxResult.success(settlements.list(SecurityUtils.getUserId(), network, status, page));
|
||||
}
|
||||
|
||||
@GetMapping("/rental/settlements/candidates")
|
||||
@PreAuthorize("@ss.hasPermi('rent:settlement:apply')")
|
||||
public AjaxResult candidates(@RequestParam String network, @RequestParam(defaultValue = "") String keyword,
|
||||
@RequestParam(defaultValue = "1") int page) {
|
||||
return AjaxResult.success(settlements.candidates(SecurityUtils.getUserId(), network, 0, keyword, page));
|
||||
}
|
||||
|
||||
@PostMapping("/rental/settlements")
|
||||
@PreAuthorize("@ss.hasPermi('rent:settlement:apply')")
|
||||
public AjaxResult apply(@RequestBody Map<String, Object> body) {
|
||||
require(body.get("order_ids") instanceof List, "请勾选来源订单");
|
||||
List<?> values = (List<?>) body.get("order_ids");
|
||||
require(!values.isEmpty() && values.size() <= 100, "请选择1至100笔来源订单");
|
||||
List<Long> ids = new ArrayList<>();
|
||||
for (Object value : values) {
|
||||
require(value != null && value.toString().matches("[1-9][0-9]{0,18}"), "来源订单编号无效");
|
||||
ids.add(Long.valueOf(value.toString()));
|
||||
}
|
||||
return AjaxResult.success(reviews.applySettlement(ids, SecurityUtils.getUserId()));
|
||||
}
|
||||
|
||||
@GetMapping("/rental/settlements/{id:[0-9]+}")
|
||||
@PreAuthorize("@ss.hasPermi('rent:settlement:view')")
|
||||
public AjaxResult detail(@PathVariable long id) {
|
||||
return AjaxResult.success(settlements.detail(SecurityUtils.getUserId(), id));
|
||||
}
|
||||
|
||||
@GetMapping("/rental/manage/settlements")
|
||||
@PreAuthorize("@ss.hasPermi('rent:manage:list')")
|
||||
public AjaxResult manage(@RequestParam String network, @RequestParam(defaultValue = "") String status,
|
||||
@RequestParam(defaultValue = "1") int page) {
|
||||
return AjaxResult.success(settlements.list(null, network, status, page));
|
||||
}
|
||||
|
||||
@GetMapping("/rental/manage/settlements/accounts")
|
||||
@PreAuthorize("@ss.hasPermi('rent:settlement:create')")
|
||||
public AjaxResult accounts(@RequestParam String network, @RequestParam(defaultValue = "") String keyword) {
|
||||
return AjaxResult.success(settlements.accounts(network, keyword));
|
||||
}
|
||||
|
||||
@GetMapping("/rental/manage/settlements/candidates")
|
||||
@PreAuthorize("@ss.hasPermi('rent:settlement:create')")
|
||||
public AjaxResult manageCandidates(@RequestParam String network, @RequestParam long account,
|
||||
@RequestParam(defaultValue = "") String keyword, @RequestParam(defaultValue = "1") int page) {
|
||||
return AjaxResult.success(settlements.candidates(null, network, account, keyword, page));
|
||||
}
|
||||
|
||||
@GetMapping("/rental/manage/settlements/{id:[0-9]+}")
|
||||
@PreAuthorize("@ss.hasPermi('rent:manage:list')")
|
||||
public AjaxResult manageDetail(@PathVariable long id) {
|
||||
return AjaxResult.success(settlements.detail(null, id));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
package com.ruoyi.system.rental;
|
||||
|
||||
import static com.ruoyi.system.rental.RentalValues.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/** 结算工作区只读查询。本人归属始终来自登录上下文,不信任浏览器传入的用户ID。 */
|
||||
@Service
|
||||
public class RentalSettlements {
|
||||
private static final int PAGE_SIZE = 20;
|
||||
private static final String NET = "(o.supplier_net_amount-o.supplier_reversed_amount+o.supplier_fee_returned_amount)";
|
||||
private static final String ELIGIBLE = " o.status='SUCCESS' AND o.fund_status='CHARGED' AND " + NET + ">0"
|
||||
+ " AND NOT EXISTS(SELECT 1 FROM rent_settlement_item i WHERE i.order_id=o.id AND i.active_slot=1)";
|
||||
private final RentalStore store;
|
||||
|
||||
public RentalSettlements(RentalStore store) {
|
||||
this.store = store;
|
||||
}
|
||||
|
||||
/** 只提供确有可申请来源的账户;管理员按账户选择,不得混合供应商或网络。 */
|
||||
public List<Map<String, Object>> accounts(String network, String keyword) {
|
||||
network(network);
|
||||
keyword = keyword(keyword);
|
||||
List<Map<String, Object>> result = store.rows("SELECT a.id,a.user_id,a.network FROM rent_account a WHERE a.network=?"
|
||||
+ " AND (CAST(a.user_id AS CHAR) LIKE ? OR CAST(a.id AS CHAR) LIKE ?)"
|
||||
+ " AND EXISTS(SELECT 1 FROM rent_order o WHERE o.supplier_account_id=a.id AND o.network=a.network AND" + ELIGIBLE + ")"
|
||||
+ " ORDER BY a.id DESC LIMIT 50", network, "%" + keyword + "%", "%" + keyword + "%");
|
||||
result.forEach(this::view);
|
||||
return result;
|
||||
}
|
||||
|
||||
public Map<String, Object> candidates(Long user, String network, long account, String keyword, int page) {
|
||||
network(network);
|
||||
int offset = offset(page);
|
||||
keyword = keyword(keyword);
|
||||
List<Object> args = new ArrayList<>();
|
||||
String where = "a.network=? AND o.network=a.network AND" + ELIGIBLE;
|
||||
args.add(network);
|
||||
if (user != null) {
|
||||
where += " AND a.user_id=? AND o.supplier_user_id=?";
|
||||
args.add(user);
|
||||
args.add(user);
|
||||
} else {
|
||||
require(account > 0, "请先选择供应商账户");
|
||||
where += " AND a.id=?";
|
||||
args.add(account);
|
||||
}
|
||||
if (!keyword.isEmpty()) {
|
||||
where += " AND (o.order_no LIKE ? OR o.receiver_address LIKE ?)";
|
||||
args.add("%" + keyword + "%");
|
||||
args.add("%" + keyword + "%");
|
||||
}
|
||||
String from = " FROM rent_order o JOIN rent_account a ON a.id=o.supplier_account_id WHERE " + where;
|
||||
long total = number(store.one("SELECT COUNT(*) AS total" + from, args.toArray()), "total");
|
||||
args.add(offset);
|
||||
List<Map<String, Object>> rows = store.rows("SELECT o.id,o.order_no,o.order_type,o.resource_type,"
|
||||
+ "o.receiver_address,o.network,o.supplier_account_id,o.created_at," + NET + " AS amount"
|
||||
+ from + " ORDER BY o.id DESC LIMIT 20 OFFSET ?", args.toArray());
|
||||
rows.forEach(this::view);
|
||||
return map("rows", rows, "total", total, "page_size", PAGE_SIZE);
|
||||
}
|
||||
|
||||
public Map<String, Object> list(Long user, String network, String status, int page) {
|
||||
network(network);
|
||||
int offset = offset(page);
|
||||
require(status == null || status.isEmpty() || Arrays.asList("PENDING", "SETTLED", "REJECTED",
|
||||
"APPROVED", "PAYING", "UNKNOWN", "PAID").contains(status), "结算状态无效");
|
||||
List<Object> args = new ArrayList<>();
|
||||
String where = "a.network=?";
|
||||
args.add(network);
|
||||
if (user != null) {
|
||||
where += " AND a.user_id=?";
|
||||
args.add(user);
|
||||
}
|
||||
if (status != null && !status.isEmpty()) {
|
||||
where += " AND s.status=?";
|
||||
args.add(status);
|
||||
}
|
||||
String from = " FROM rent_settlement s JOIN rent_account a ON a.id=s.account_id WHERE " + where;
|
||||
long total = number(store.one("SELECT COUNT(*) AS total" + from, args.toArray()), "total");
|
||||
args.add(offset);
|
||||
List<Map<String, Object>> rows = store.rows("SELECT s.id,s.settlement_no,s.settlement_mode,s.status,"
|
||||
+ "s.account_id,a.user_id,a.network,s.amount,s.created_by,s.created_at,s.settled_at,s.remark,"
|
||||
+ "(SELECT COUNT(*) FROM rent_settlement_item i WHERE i.settlement_id=s.id) AS source_count"
|
||||
+ from + " ORDER BY s.id DESC LIMIT 20 OFFSET ?", args.toArray());
|
||||
rows.forEach(this::view);
|
||||
Map<String, Object> balance = user == null ? null : store.one("SELECT id,network,available_amount,"
|
||||
+ "supplier_pending_amount,frozen_amount,status FROM rent_account WHERE user_id=? AND network=?", user, network);
|
||||
if (balance != null) {
|
||||
for (String key : Arrays.asList("available_amount", "supplier_pending_amount", "frozen_amount")) {
|
||||
balance.put(key, amount(balance, key).toPlainString());
|
||||
}
|
||||
}
|
||||
return map("rows", rows, "total", total, "page_size", PAGE_SIZE, "account", balance);
|
||||
}
|
||||
|
||||
public Map<String, Object> detail(Long user, long id) {
|
||||
Map<String, Object> row = store.one("SELECT s.*,a.user_id,a.network FROM rent_settlement s"
|
||||
+ " JOIN rent_account a ON a.id=s.account_id WHERE s.id=?" + (user == null ? "" : " AND a.user_id=?"),
|
||||
user == null ? new Object[] {id} : new Object[] {id, user});
|
||||
require(row != null, "结算单不存在或无权查看");
|
||||
// 明细仅返回履约订单摘要和结算金额,不返回密钥、成本规则或商户认证材料。
|
||||
List<Map<String, Object>> items = store.rows("SELECT i.order_id,o.order_no,o.order_type,o.resource_type,"
|
||||
+ "o.receiver_address,o.network,i.amount FROM rent_settlement_item i"
|
||||
+ " JOIN rent_order o ON o.id=i.order_id WHERE i.settlement_id=? ORDER BY i.order_id", id);
|
||||
items.forEach(this::view);
|
||||
row.remove("payment_evidence");
|
||||
view(row);
|
||||
return map("settlement", row, "items", items);
|
||||
}
|
||||
|
||||
private void view(Map<String, Object> row) {
|
||||
// 浏览器数字精度仅53位;业务编号按字符串返回,避免BIGINT被舍入后提交错单。
|
||||
for (String field : Arrays.asList("id", "order_id", "account_id", "supplier_account_id", "user_id")) {
|
||||
if (row.get(field) != null) {
|
||||
row.put(field, row.get(field).toString());
|
||||
}
|
||||
}
|
||||
if (row.get("amount") != null) {
|
||||
row.put("amount", amount(row, "amount").toPlainString());
|
||||
}
|
||||
for (String field : Arrays.asList("created_at", "updated_at", "settled_at", "paid_at", "payment_started_at")) {
|
||||
if (row.get(field) != null) {
|
||||
row.put(field, time(row.get(field)).toEpochMilli());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int offset(int page) {
|
||||
require(page >= 1 && page <= 10000, "分页参数无效");
|
||||
return (page - 1) * PAGE_SIZE;
|
||||
}
|
||||
|
||||
private String keyword(String keyword) {
|
||||
String value = keyword == null ? "" : keyword.trim();
|
||||
require(value.length() <= 100, "搜索内容最多100字");
|
||||
return value;
|
||||
}
|
||||
}
|
||||
@@ -1049,6 +1049,56 @@ public class RentalBusinessTest {
|
||||
expectFailure(() -> tx.execute(status -> reviews.settlement(Collections.singletonList(order), 90)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void supplierSettlementCandidatesAndDetailAlwaysEnforceOwnership() {
|
||||
long order = incomeOrder();
|
||||
RentalSettlements queries = new RentalSettlements(store);
|
||||
assertEquals(1, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(10L, "NILE", supplier, "", 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(20L, "MAINNET", 0, "", 1), "total"));
|
||||
assertEquals(1, queries.accounts("NILE", "20").size());
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 10)));
|
||||
assertTrue(store.rows("SELECT id FROM rent_settlement").isEmpty());
|
||||
long settlement = tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(null, "NILE", supplier, "", 1), "total"));
|
||||
assertEquals(1, number(queries.list(20L, "NILE", "PENDING", 1), "total"));
|
||||
assertEquals(0, number(queries.list(10L, "NILE", "", 1), "total"));
|
||||
assertEquals(0, number(queries.list(20L, "MAINNET", "", 1), "total"));
|
||||
Map<String, Object> detail = queries.detail(20L, settlement);
|
||||
assertEquals(1, ((List<?>) detail.get("items")).size());
|
||||
Map<String, Object> row = (Map<String, Object>) detail.get("settlement");
|
||||
assertTrue(row.get("created_at") instanceof Long);
|
||||
assertEquals("0.163457", row.get("amount"));
|
||||
expectFailure(() -> queries.detail(10L, settlement));
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20)));
|
||||
tx.execute(status -> reviews.transition(settlement, "reject", 91, "重新选择"));
|
||||
assertEquals(1, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
long next = tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20));
|
||||
tx.execute(status -> reviews.transition(next, "approve", 91, "入账"));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void settlementCandidatesExcludeInvalidStatesAndRejectForgedFilters() {
|
||||
long order = incomeOrder();
|
||||
RentalSettlements queries = new RentalSettlements(store);
|
||||
for (String state : new String[] {"WAITING", "EXECUTING", "MANUAL_REVIEW", "FAILED"}) {
|
||||
store.update("order", order, map("status", state));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20)));
|
||||
}
|
||||
store.update("order", order, map("status", "SUCCESS"));
|
||||
assertEquals(1, number(queries.candidates(null, "NILE", supplier, ADDRESS, 1), "total"));
|
||||
assertEquals(0, number(queries.candidates(null, "NILE", payer, "", 1), "total"));
|
||||
expectFailure(() -> queries.candidates(null, "NILE", 0, "", 1));
|
||||
expectFailure(() -> queries.list(20L, "NILE", "INVALID", 1));
|
||||
expectFailure(() -> queries.list(20L, "NILE", "", 0));
|
||||
store.update("order", order, map("supplier_reversed_amount", money("0.163457")));
|
||||
assertEquals(0, number(queries.candidates(20L, "NILE", 0, "", 1), "total"));
|
||||
expectFailure(() -> tx.execute(status -> reviews.applySettlement(Collections.singletonList(order), 20)));
|
||||
}
|
||||
|
||||
private Map<String, Object> onchainRequest(String merchant) {
|
||||
return map("order_type", "ADDRESS_ONCHAIN", "network", "NILE", "merchant_order_no", merchant,
|
||||
"receiver_address", ADDRESS, "expected_amount", "0.173457");
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
-- 先执行rent_income_settlement_migration.sql。仅新增本人结算权限,不授予供应商管理/审批能力。
|
||||
START TRANSACTION;
|
||||
SET @settlement_parent=COALESCE(
|
||||
(SELECT parent_id FROM sys_menu WHERE perms='rent:supplier:home' AND parent_id<>0 ORDER BY menu_id LIMIT 1),
|
||||
(SELECT parent_id FROM sys_menu WHERE perms='rent:portal:view' AND parent_id<>0 ORDER BY menu_id LIMIT 1),
|
||||
(SELECT menu_id FROM sys_menu WHERE parent_id=0 AND path IN ('proxyRent','rental') ORDER BY menu_id LIMIT 1));
|
||||
INSERT INTO sys_menu(menu_name,parent_id,order_num,path,component,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time)
|
||||
SELECT '我的收益结算',@settlement_parent,22,'supplier-settlement','system/rentSettlement/user/index',1,0,'C','0','0','rent:settlement:view','money','admin',NOW()
|
||||
WHERE @settlement_parent IS NOT NULL AND NOT EXISTS(SELECT 1 FROM sys_menu WHERE perms='rent:settlement:view');
|
||||
SET @settlement_supplier_menu=(SELECT menu_id FROM sys_menu WHERE perms='rent:settlement:view' LIMIT 1);
|
||||
INSERT INTO sys_menu(menu_name,parent_id,order_num,path,is_frame,is_cache,menu_type,visible,status,perms,icon,create_by,create_time)
|
||||
SELECT '申请本人收益结算',@settlement_supplier_menu,1,'#',1,0,'F','0','0','rent:settlement:apply','#','admin',NOW()
|
||||
WHERE @settlement_supplier_menu IS NOT NULL AND NOT EXISTS(SELECT 1 FROM sys_menu WHERE perms='rent:settlement:apply');
|
||||
INSERT INTO sys_role_menu(role_id,menu_id)
|
||||
SELECT r.role_id,m.menu_id FROM sys_role r JOIN sys_menu m
|
||||
ON (m.menu_id=@settlement_parent OR m.perms IN ('rent:settlement:view','rent:settlement:apply'))
|
||||
WHERE r.role_key='PROXY_SUPPLIER' AND r.del_flag='0'
|
||||
AND NOT EXISTS(SELECT 1 FROM sys_role_menu x WHERE x.role_id=r.role_id AND x.menu_id=m.menu_id);
|
||||
COMMIT;
|
||||
Reference in new issue
Block a user