From 67157345fe1878681e39ec186ef37ff6b3b5c1fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 03 八月 2024 18:07:00 +0800
Subject: [PATCH] 8.3
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
index e064f84..9685325 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
@@ -7,6 +7,7 @@
import com.ruoyi.admin.api.feignClient.AdminClient;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.RedisConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -15,15 +16,9 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUserInfo;
-import com.ruoyi.user.entity.RecoveryClassify;
-import com.ruoyi.user.entity.RecoveryServe;
-import com.ruoyi.user.entity.User;
-import com.ruoyi.user.entity.UserRecipient;
+import com.ruoyi.user.entity.*;
import com.ruoyi.user.request.LoginPhoneRequest;
-import com.ruoyi.user.service.RecoveryClassifyService;
-import com.ruoyi.user.service.RecoveryServeService;
-import com.ruoyi.user.service.UserRecipientService;
-import com.ruoyi.user.service.UserService;
+import com.ruoyi.user.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -35,6 +30,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -288,7 +284,6 @@
}
- @ApiOperation(value = "订单列表-更改订单提现状态", tags = {"后台-订单管理"})
@PostMapping(value = "/getUser")
public R<UserDto> updateWithdrawalState(@RequestParam("userId") Integer userId) {
@@ -306,11 +301,26 @@
AddressDto userDto = new AddressDto();
userDto.setCityCode(byId.getCityCode());
userDto.setCity(byId.getCity());
+ userDto.setName(byId.getName());
return R.ok(userDto);
}
+ @Resource
+ private RecoveryServePriceService recoveryServePriceService;
+
+ @PostMapping(value = "/getServePrice")
+ public R<BigDecimal> getServePrice(@RequestParam("serveId") Integer serveId, @RequestParam("cityCode") String cityCode) {
+ RecoveryServePrice one = recoveryServePriceService.lambdaQuery().eq(RecoveryServePrice::getRecoveryServeId, serveId).eq(RecoveryServePrice::getCity, cityCode).eq(RecoveryServePrice::getIsDelete, 0).one();
+ if (one==null){
+ return R.ok(null);
+ }
+ return R.ok(one.getRecoveryPrice());
+
+ }
+
+
/**
* 用户端-个人中心用户信息
*/
--
Gitblit v1.7.1