From f66cd5340a8c9a5264c82549f25e4d88cf2d815a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 五月 2024 15:54:18 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
index 5c1456f..b0f8bba 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
@@ -4,13 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.member.DTO.MemberAddressDTO;
-import com.ruoyi.member.domain.pojo.MemberAddress;
-import com.ruoyi.member.domain.pojo.MemberCollection;
+import com.ruoyi.member.dto.MemberAddressDTO;
import com.ruoyi.member.domain.vo.RegionVo;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
+import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
@@ -71,7 +71,7 @@
@PostMapping("/getMemberAddressList")
@ResponseBody
@ApiOperation(value = "获取用户地址")
- public R<List<MemberAddress>> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
+ public R<PageDTO<MemberAddress>> getMemberAddressList(MemberAddressDTO memberAddressDTO) {
return R.ok(iMemberAddressService.getMemberAddressList(memberAddressDTO));
}
@@ -82,4 +82,15 @@
iMemberAddressService.addMemberAddress(memberAddressDTO);
return R.ok();
}
+
+ @PostMapping("/delMemberAddress")
+ @ResponseBody
+ @ApiOperation(value = "用户删除地址")
+ public R<T> delMemberAddress(MemberAddressDTO memberAddressDTO) {
+ iMemberAddressService.delMemberAddress(memberAddressDTO);
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.7.1