From 09ac251a089f5bb79d59a12bf2f932dda12c4ca2 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 15:53:17 +0800
Subject: [PATCH] 小程序：微信授权登录；根据订单号查询订单操作日志
---
oying-system/src/main/java/com/oying/modules/sh/rest/UserAddressController.java | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 58894d2..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,26 +1,32 @@
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;
-import com.oying.utils.PageResult;
/**
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @date 2025-06-11
+ **/
@RestController
@RequiredArgsConstructor
@Api(tags = "SH：用户地址")
@@ -39,35 +45,47 @@
@GetMapping
@ApiOperation("查询用户地址")
@PreAuthorize("@el.check('userAddress:list')")
- public ResponseEntity<PageResult<UserAddress>> queryUserAddress(UserAddressQueryCriteria criteria){
+ public ResponseEntity<Object> queryUserAddress(UserAddressQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return new ResponseEntity<>(userAddressService.queryAll(criteria,page),HttpStatus.OK);
+ 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')")
- public ResponseEntity<Object> createUserAddress(@Validated @RequestBody UserAddress resources){
+ @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<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@PutMapping
- @Log("修改用户地址")
- @ApiOperation("修改用户地址")
- @PreAuthorize("@el.check('userAddress:edit')")
- public ResponseEntity<Object> updateUserAddress(@Validated @RequestBody UserAddress resources){
+ @Log("小程序：修改用户地址")
+ @ApiOperation("小程序：修改用户地址")
+ public ResponseEntity<Object> updateUserAddress(@Validated @RequestBody UserAddress resources) {
+ if (resources.getAddressId() == null) {
+ throw new BadRequestException("修改用户地址主键不能为空");
+ }
userAddressService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ 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<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3