From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/sh/rest/UserAddressController.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/rest/UserAddressController.java b/oying-system/src/main/java/com/oying/modules/sh/rest/UserAddressController.java
new file mode 100644
index 0000000..6bf864f
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/sh/rest/UserAddressController.java
@@ -0,0 +1,89 @@
+package com.oying.modules.sh.rest;
+
+import com.oying.annotation.Log;
+import com.oying.exception.BadRequestException;
+import com.oying.modules.sh.domain.UserAddress;
+import com.oying.modules.sh.service.UserAddressService;
+import com.oying.modules.sh.domain.dto.UserAddressQueryCriteria;
+import com.oying.utils.R;
+import com.oying.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * @author lixin
+ * @date 2025-06-11
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "SH:用户地址")
+@RequestMapping("/api/userAddress")
+public class UserAddressController {
+
+    private final UserAddressService userAddressService;
+
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('userAddress:list')")
+    public void exportUserAddress(HttpServletResponse response, UserAddressQueryCriteria criteria) throws IOException {
+        userAddressService.download(userAddressService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @ApiOperation("查询用户地址")
+    @PreAuthorize("@el.check('userAddress:list')")
+    public ResponseEntity<Object> queryUserAddress(UserAddressQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        return new ResponseEntity<>(R.success(userAddressService.queryAll(criteria, page)), HttpStatus.OK);
+    }
+
+    @GetMapping("mini")
+    @ApiOperation("小程序:查询用户地址")
+    public ResponseEntity<Object> miniQueryUserAddress(UserAddressQueryCriteria criteria) {
+        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
+        criteria.setUserId(SecurityUtils.getCurrentUserId());
+        return new ResponseEntity<>(R.success(userAddressService.queryAll(criteria, page)), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("小程序:新增用户地址")
+    @ApiOperation("小程序:新增用户地址")
+    public ResponseEntity<Object> createUserAddress(@Validated @RequestBody UserAddress resources) {
+        resources.setAddressId(null);
+        resources.setUserId(SecurityUtils.getCurrentUserId());
+        userAddressService.create(resources);
+        return new ResponseEntity<>(R.success(resources), HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("小程序:修改用户地址")
+    @ApiOperation("小程序:修改用户地址")
+    public ResponseEntity<Object> updateUserAddress(@Validated @RequestBody UserAddress resources) {
+        if (resources.getAddressId() == null) {
+            throw new BadRequestException("修改用户地址主键不能为空");
+        }
+        userAddressService.update(resources);
+        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
+    }
+
+    @DeleteMapping
+    @Log("小程序:删除用户地址")
+    @ApiOperation("小程序:删除用户地址")
+    public ResponseEntity<Object> deleteUserAddress(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
+        userAddressService.deleteAll(ids);
+        return new ResponseEntity<>(R.success(), HttpStatus.OK);
+    }
+}

--
Gitblit v1.9.3