From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java
index 6d0bdf9..73091a9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java
@@ -1,6 +1,14 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.model.UserAddress;
+import com.ruoyi.account.service.UserAddressService;
+import com.ruoyi.common.core.domain.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.account.service.UserAddressService;
@@ -23,16 +31,39 @@
@RestController
@RequestMapping("/user-address")
public class UserAddressController {
+
+ @Resource
+ private UserAddressService userAddressService;
+
+ @Resource
+ private TokenService tokenService;
+
+
+ /**
+ * 获取用户默认地址
+ * @param userId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getDefaultUserAddress")
+ public R<UserAddress> getDefaultUserAddress(@RequestParam("userId") Long userId){
+ List<UserAddress> list = userAddressService.list(new LambdaQueryWrapper<UserAddress>().eq(UserAddress::getAppUserId, userId).eq(UserAddress::getDelFlag, 0));
+ if(list.size() == 0){
+ return R.ok();
+ }
+ UserAddress userAddress = list.stream().filter(s -> s.getIsDefault() == 1).findFirst().get();
+ if(null == userAddress){
+ userAddress = list.get(0);
+ }
+ return R.ok(userAddress);
+ }
- @Resource
- private TokenService tokenService;
- @Resource
- private UserAddressService userAddressService;
+
@ResponseBody
@PostMapping("/add")
@ApiOperation(value = "添加", tags = {"小程序-个人中心首页-我的地址"})
public R add(@RequestBody UserAddress userAddress){
- Long userId = tokenService.getLoginUserApplet().getUserId();
+ Long userId = tokenService.getLoginUserApplet().getUserid();
userAddress.setAppUserId(userId);
userAddressService.save(userAddress);
return R.ok();
@@ -56,7 +87,7 @@
@PostMapping("/set")
@ApiOperation(value = "设为默认", tags = {"小程序-个人中心首页-我的地址"})
public R set(@RequestParam Integer id){
- Long userId = tokenService.getLoginUserApplet().getUserId();
+ Long userId = tokenService.getLoginUserApplet().getUserid();
List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
for (UserAddress userAddress : list) {
userAddress.setIsDefault(0);
@@ -68,6 +99,18 @@
userAddressService.updateById(byId);
return R.ok();
}
-
+
+ /**
+ * 根据id获取用户地址信息
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getUserAddressById")
+ public R<UserAddress> getUserAddressById(@RequestParam("id") Integer id){
+ UserAddress userAddress = userAddressService.getById(id);
+ return R.ok(userAddress);
+ }
+
}
--
Gitblit v1.7.1