From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:48:43 +0800
Subject: [PATCH] Merge branch 'mitao-dev'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 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 ed67602..489824c 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,11 +4,20 @@
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.member.domain.pojo.MemberAddress;
-import com.ruoyi.member.domain.pojo.MemberCollection;
+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.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.Api;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -20,6 +29,7 @@
*/
@RestController
@RequestMapping("/member-address")
+@Api(value = "用户端-用户地址相关接口", tags = "用户端-用户地址相关接口", description = "用户端-用户地址相关接口")
public class MemberAddressController {
/**
* 获取当前商品信息
@@ -28,8 +38,14 @@
@ApiModelProperty
private IMemberAddressService iMemberAddressService;
+
+ @ApiModelProperty
+ private IRegionService IRegionService;
+
+
@PostMapping("/getMemberAddressOne")
@ResponseBody
+ @InnerAuth
public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
wrapper2.eq(MemberAddress::getMemberId,userId);
@@ -46,4 +62,37 @@
return R.ok(memberAddress);
}
+
+ @PostMapping("/getRegione")
+ @ResponseBody
+ @ApiOperation(value = "用户端-获取三级联动的地址")
+ public R<List<RegionVo>> getRegione() {
+ return R.ok(IRegionService.listRegionVo());
+ }
+
+ @PostMapping("/getMemberAddressList")
+ @ResponseBody
+ @ApiOperation(value = "用户端-获取用户地址")
+ public R<PageDTO<MemberAddress>> getMemberAddressList(@RequestBody MemberAddressDTO memberAddressDTO) {
+ return R.ok(iMemberAddressService.getMemberAddressList(memberAddressDTO));
+ }
+
+ @PostMapping("/addMemberAddress")
+ @ResponseBody
+ @ApiOperation(value = "用户端-用户添加或者修改地址")
+ public R addMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) {
+ iMemberAddressService.addMemberAddress(memberAddressDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/delMemberAddress")
+ @ResponseBody
+ @ApiOperation(value = "用户端-用户删除地址")
+ public R delMemberAddress(@RequestBody MemberAddressDTO memberAddressDTO) {
+ iMemberAddressService.delMemberAddress(memberAddressDTO);
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.7.1