From 6e70ee2d0b73f70fe1140cc7d51c4e847d50aa51 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 四月 2025 10:54:26 +0800
Subject: [PATCH] 2.0迭代师傅订单列表
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 7d0b568..1494421 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,29 +7,30 @@
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;
+import com.ruoyi.common.core.vo.AddressDto;
+import com.ruoyi.common.core.vo.UserDto;
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.*;
import com.ruoyi.user.request.LoginPhoneRequest;
-import com.ruoyi.user.service.RecoveryClassifyService;
-import com.ruoyi.user.service.RecoveryServeService;
-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;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
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;
@@ -59,6 +60,8 @@
private RecoveryClassifyService recoveryClassifyService;
@Resource
private RecoveryServeService recoveryServeService;
+ @Resource
+ private UserRecipientService userRecipientService;
/**
* 用户端默认头像
@@ -128,7 +131,7 @@
.eq(User::getIsDelete, 0).one();
if (null != user) {
if (!Constants.ONE.equals(user.getState())) {
- return R.notEnabled("登录失败，当前账号未启用!");
+ return R.notEnabled("账号已被禁用，请联系平台管理员。");
}
} else {
user = new User();
@@ -280,6 +283,45 @@
return R.ok(serveList);
}
+
+ @PostMapping(value = "/getUser")
+ public R<UserDto> updateWithdrawalState(@RequestParam("userId") Integer userId) {
+
+ User byId = userService.getById(userId);
+ UserDto userDto = new UserDto();
+ BeanUtils.copyProperties(byId,userDto);
+ return R.ok(userDto);
+
+ }
+
+// @ApiOperation(value = "订单列表-更改订单提现状态", tags = {"后台-订单管理"})
+ @PostMapping(value = "/getCityCode")
+ public R<AddressDto> getCityCode(@RequestParam("addressId") Integer addressId) {
+ UserRecipient byId = userRecipientService.getById(addressId);
+ AddressDto userDto = new AddressDto();
+ userDto.setCityCode(byId.getCityCode());
+ userDto.setCity(byId.getCity());
+ userDto.setName(byId.getName());
+ userDto.setDetail(byId.getAddressDetail());
+ 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