From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
index 2f472a4..d02cff0 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
@@ -7,7 +7,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUserInfo;
+import com.ruoyi.user.entity.Region;
import com.ruoyi.user.entity.UserRecipient;
+import com.ruoyi.user.service.RegionService;
import com.ruoyi.user.service.UserRecipientService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -97,6 +99,9 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
+ Region one = regionService.lambdaQuery().eq(Region::getCode, userRecipient.getCityCode()).one();
+ userRecipient.setCity(one.getName());
+
userRecipient.setUserId(loginUser.getUserid());
// 当前新增收货地址为默认地址时
boolean result = recipientService.updateBatchAddress(userRecipient, loginUser.getUserid());
@@ -126,6 +131,9 @@
return update ? R.ok() : R.fail();
}
+
+ @Resource
+ private RegionService regionService;
/**
* 修改收货地址
*
@@ -139,6 +147,8 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
+ Region one = regionService.lambdaQuery().eq(Region::getCode, userRecipient.getCityCode()).one();
+ userRecipient.setCity(one.getName());
// 当前修改收货地址为默认地址时
boolean result = recipientService.updateBatchAddress(userRecipient, loginUser.getUserid());
return result && recipientService.updateById(userRecipient) ? R.ok() : R.fail();
--
Gitblit v1.7.1