From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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..8abf416 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,11 +31,34 @@
@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 = {"小程序-个人中心首页-我的地址"})
--
Gitblit v1.7.1