From 498288ba58aaeaea0453424a8f9b8448582ff0df Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 十二月 2020 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-user/src/main/java/com/java110/user/api/UserAddressApi.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/UserAddressApi.java b/service-user/src/main/java/com/java110/user/api/UserAddressApi.java
index 1ca5767..bac26c6 100644
--- a/service-user/src/main/java/com/java110/user/api/UserAddressApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserAddressApi.java
@@ -87,9 +87,9 @@
*/
@RequestMapping(value = "/deleteUserAddress", method = RequestMethod.POST)
public ResponseEntity<String> deleteUserAddress(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "addressId", "addressId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "userId", "鐢ㄦ埛ID涓嶈兘涓虹┖");
UserAddressPo userAddressPo = BeanConvertUtil.covertBean(reqJson, UserAddressPo.class);
@@ -106,12 +106,16 @@
*/
@RequestMapping(value = "/queryUserAddress", method = RequestMethod.GET)
public ResponseEntity<String> queryUserAddress(@RequestParam(value = "userId") String userId,
+ @RequestParam(value = "addressId", required = false) String addressId,
+ @RequestParam(value="isDefault",required = false) String isDefault,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
UserAddressDto userAddressDto = new UserAddressDto();
userAddressDto.setPage(page);
userAddressDto.setRow(row);
userAddressDto.setUserId(userId);
+ userAddressDto.setAddressId(addressId);
+ userAddressDto.setIsDefault(isDefault);
return getUserAddressBMOImpl.get(userAddressDto);
}
}
--
Gitblit v1.8.0