Merge remote-tracking branch 'origin/yxp' into yxp

src/main/java/com/futu/course/user/controller/UserAddressController.java

@@ -0,0 +1,33 @@
+package com.futu.course.user.controller;
+
+import com.futu.course.user.domain.UserAddress;
+import com.futu.course.user.service.impl.UserAddressServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author "杨旭朋"
+ * @ClassName: UserAddressController
+ * @date 2025年05月12日 08:44
+ */
+@RestController
+@RequestMapping("userAddress")
+public class UserAddressController {
+    @Autowired
+    UserAddressServiceImpl userAddressService;
+    @GetMapping("UserAddressList")
+    public List<UserAddress> userArrayList(){
+        return userAddressService.UserAddressList();
+    }
+    @GetMapping("selUserDefault")
+    public UserAddress selUserDefault(){
+        return userAddressService.selUserDefault();
+    }
+    @PostMapping("addUserAddress")
+    public UserAddress addUserAddress(@RequestBody UserAddress userAddress){
+        return userAddressService.addUserAddress(userAddress);
+    }
+}

src/main/java/com/futu/course/user/controller/UserController.java

@@ -1,8 +1,11 @@
 package com.futu.course.user.controller;
 
+import com.futu.course.user.domain.User;
+import com.futu.course.user.domain.UserAddress;
 import com.futu.course.user.service.impl.UserServiceImpl;
 import io.minio.errors.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,6 +14,8 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author "杨旭朋"
@@ -26,4 +31,5 @@ public class UserController {
     public String unload(MultipartFile multipartFile,Long uid) throws ServerException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
         return userService.unload(multipartFile,uid);
     }
+
 }

src/main/java/com/futu/course/user/service/impl/UserAddressServiceImpl.java

@@ -1,20 +1,68 @@
 package com.futu.course.user.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.user.domain.UserAddress;
 import com.futu.course.user.service.UserAddressService;
 import com.futu.course.user.mapper.UserAddressMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 * @author yuu
 * @description 针对表【user_address(收货地址表)】的数据库操作Service实现
 * @createDate 2025-05-05 18:52:53
 */
 @Service
-public class UserAddressServiceImpl extends ServiceImpl<UserAddressMapper, UserAddress>
-    implements UserAddressService{
+public class UserAddressServiceImpl extends ServiceImpl<UserAddressMapper, UserAddress> implements UserAddressService{
+    private final Long uid=1919928855523627008L;
+    /**
+     * @title: UserAddressList
+     * @desc: 查询用户所有地址
+     * @params 无
+     * @return: List<UserAddress>
+     * @author: 杨旭朋
+     * @date: 2025/5/12 8:47
+     */
+    public List<UserAddress> UserAddressList() {
+        LambdaQueryWrapper<UserAddress> eq = Wrappers.<UserAddress>lambdaQuery().eq(UserAddress::getUserId, uid);
+        return this.list(eq);
+    }
+/**
+ * @title: selUserDefault
+ * @desc:  查询用户的默认地址如果只有一条数据则默认
+ * @params
+ * @return: UserAddress
+ * @author: 杨旭朋
+ * @date: 2025/5/12 9:06
+ */
+    public UserAddress selUserDefault() {
+        List<UserAddress> userAddresses = this.UserAddressList();
+        UserAddress userAddressDefault = new UserAddress();
+        // 判断用户地址数量如果为1则设为默认地址
+        if (userAddresses.size() == 1){
+            userAddresses.get(0).setIsDefault(1);
+            this.updateById(userAddresses.get(0));
+            userAddressDefault=userAddresses.get(0);
+        }else {
+            for (UserAddress userAddress : userAddresses) {
+                if (userAddress.getIsDefault() == 1){
+                    userAddressDefault=userAddress;
+                }
+            }
+        }
+        return userAddressDefault;
+    }
 
+    public UserAddress addUserAddress(UserAddress userAddress) {
+        userAddress.setUserId(uid);
+//        SnowflakeIdWorker snowflakeIdWorker=new SnowflakeIdWorker(1,1);
+//        long l = snowflakeIdWorker.nextId();
+        return null;
+    }
 }
 
 

src/main/java/com/futu/course/user/service/impl/UserServiceImpl.java

@@ -1,8 +1,11 @@
 package com.futu.course.user.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.minio.service.impl.FileServiceImpl;
 import com.futu.course.user.domain.User;
+import com.futu.course.user.domain.UserAddress;
 import com.futu.course.user.service.UserService;
 import com.futu.course.user.mapper.UserMapper;
 import io.minio.errors.*;
@@ -14,6 +17,8 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
 * @author yuu