Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-29 d2542a6123fa6834e01ed3af23c7ba0a02696bc6

 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 = {"小程序-个人中心首页-我的地址"})