From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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..2aa6462 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,15 +2,17 @@
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;
import com.ruoyi.common.core.exception.GlobalException;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.order.api.entity.UserWithdrawRecordVO;
-import com.ruoyi.order.api.entity.Withdraw;
-import com.ruoyi.order.api.entity.WithdrawExportRequest;
+import com.ruoyi.order.api.entity.*;
+import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.feignClient.WithdrawClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
@@ -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;
@@ -42,10 +46,14 @@
@Resource
private WithdrawClient withdrawClient;
@Resource
+ private OrderClient orderClient;
+ @Resource
private UserService userService;
@Resource
private TokenService tokenService;
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 用户所关联提现记录分页列表
*
@@ -78,8 +86,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();
@@ -107,7 +126,17 @@
@ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true)
})
public R<Withdraw> withdrawRecordDetail(@RequestParam Long id) {
- return withdrawClient.withdrawRecordDetail(id);
+ Withdraw data = withdrawClient.withdrawRecordDetail(id).getData();
+ User user = userService.getById(data.getUserId());
+ UserVO userVO = new UserVO();
+ BeanUtils.copyProperties(user, userVO);
+ data.setUser(userVO);
+ Order data1 = orderClient.detail(data.getOrderId()).getData();
+ data.setSubsidy(data1.getSubsidy());
+ data.setServeName(data1.getServeName());
+ data.setServePrice(data1.getServePrice());
+ data.setReservationAddress(data1.getReservationAddress());
+ return R.ok(data);
}
/**
--
Gitblit v1.7.1