From c19fd2da97b631cc720f039967760da475887554 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:34:01 +0800
Subject: [PATCH] 二手新增迭代
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 264301d..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
@@ -9,10 +9,10 @@
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;
@@ -45,6 +45,8 @@
private WithdrawService withdrawService;
@Resource
private WithdrawClient withdrawClient;
+ @Resource
+ private OrderClient orderClient;
@Resource
private UserService userService;
@@ -124,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