From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java
index a12f483..264301d 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.User;
+import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.service.WithdrawService;
import com.ruoyi.common.core.domain.R;
@@ -21,6 +23,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Array;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -46,6 +50,8 @@
@Resource
private TokenService tokenService;
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 用户所关联提现记录分页列表
*
@@ -78,8 +84,19 @@
List<String> cityList = loginUser.getCityList();
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+ if (franchiseeId!=null){
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ if (loginUser.getIsFranchisee()&&siteIds.length==0){
+ return R.ok();
+ }
+ }
+
+
Page<UserWithdrawRecordVO> page = withdrawClient.withdrawPage1(cityList,nickname, userPhone, applyForTime,
- state, pageNum, pageSize,userIds).getData();
+ state, pageNum, pageSize,userIds, Arrays.asList(siteIds)).getData();
if (null != page) {
for (UserWithdrawRecordVO record : page.getRecords()) {
Integer userId = record.getUserId();
--
Gitblit v1.7.1