From e51a75ac70bcc93ae6390b6f376dcf3d4afe8580 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sun, 06 Jul 2025 21:58:37 +0800
Subject: [PATCH] 小程序:提交订单(待完善)

---
 oying-system/src/main/java/com/oying/modules/sh/rest/UserAddressController.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 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
index 58f309f..cc70dad 100644
--- 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
@@ -1,10 +1,12 @@
 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;
@@ -48,28 +50,40 @@
         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("新增用户地址")
-    @PreAuthorize("@el.check('userAddress:add')")
+    @Log("小程序:新增用户地址")
+    @ApiOperation("小程序:新增用户地址")
     public ResponseEntity<Object> createUserAddress(@Validated @RequestBody UserAddress resources) {
+        if (resources.getAddressId() != null) {
+            throw new BadRequestException("新增用户地址主键必须为空");
+        }
+        resources.setUserId(SecurityUtils.getCurrentUserId());
         userAddressService.create(resources);
         return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
     }
 
     @PutMapping
-    @Log("修改用户地址")
-    @ApiOperation("修改用户地址")
-    @PreAuthorize("@el.check('userAddress:edit')")
+    @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("删除用户地址")
-    @PreAuthorize("@el.check('userAddress:del')")
+    @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