bug fix 1018

src/main/java/com/peanut/modules/book/controller/UserAddressController.java

@@ -1,15 +1,16 @@
 package com.peanut.modules.book.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
 import com.peanut.modules.book.entity.UserAddress;
 import com.peanut.modules.book.service.UserAddressService;
+import com.peanut.modules.book.vo.UserAddressVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 
 @RestController
@@ -18,19 +19,6 @@ public class UserAddressController {
     @Autowired
     private UserAddressService userAddressService;
 
-    /**
-     * 用户地址列表
-     *
-     * @param params param
-     * @return R
-     */
-    @RequestMapping("/list")
-    public R list(@RequestParam Map<String, Object> params) {
-        PageUtils page = userAddressService.queryPage(params);
-        return R.ok().put("page", page);
-    }
-
-
     /**
      * 获取地址信息
      *
@@ -40,18 +28,34 @@ public class UserAddressController {
     @RequestMapping("/info/{addressId}")
     public R info(@PathVariable("addressId") Integer addressId) {
         UserAddress userAddress = userAddressService.getById(addressId);
-        return R.ok().put("userAddress", userAddress);
+        UserAddressVo vo = new UserAddressVo();
+        BeanUtil.copyProperties(userAddress, vo);
+        vo = userAddressService.getAddressName(vo, userAddress.getRegionCode());
+        return R.ok().put("result", vo);
     }
 
     /**
-     * 保存、更新
+     * 保存
      *
      * @param userAddress 用户地址
      * @return R
      */
     @RequestMapping("/save")
     public R save(@RequestBody UserAddress userAddress) {
-        userAddressService.saveOrUpdate(userAddress);
+        // 判断是否已经有默认的地址了
+        if ((userAddressService.getUserDefaultAddressCount(userAddress.getUserId()) >= 1) && userAddress.getIsDefault() == 1) {
+            return R.error("已经存在默认地址");
+        }
+        userAddressService.save(userAddress);
+        return R.ok();
+    }
+
+    @RequestMapping("/update")
+    public R update(@RequestBody UserAddress userAddress) {
+        if ((userAddressService.getUserDefaultAddressCount(userAddress.getUserId()) >= 1) && userAddress.getIsDefault() == 1) {
+            return R.error("已经存在默认地址");
+        }
+        userAddressService.updateById(userAddress);
         return R.ok();
     }
 
@@ -79,6 +83,13 @@ public class UserAddressController {
         queryWrapper.eq("user_id", userId);
         queryWrapper.orderByDesc("is_default");
         List<UserAddress> userAddressList = userAddressService.list(queryWrapper);
-        return R.ok().put("list", userAddressList);
+        List<UserAddressVo> result = new ArrayList<>();
+        for (UserAddress userAddress : userAddressList) {
+            UserAddressVo vo = new UserAddressVo();
+            BeanUtil.copyProperties(userAddress, vo);
+            vo = userAddressService.getAddressName(vo, userAddress.getRegionCode());
+            result.add(vo);
+        }
+        return R.ok().put("list", result);
     }
 }