From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/UserAddressApi.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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
old mode 100644
new mode 100755
index 1ca5767..528769d
--- a/service-user/src/main/java/com/java110/user/api/UserAddressApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserAddressApi.java
@@ -1,8 +1,8 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.userAddress.UserAddressDto;
-import com.java110.po.userAddress.UserAddressPo;
+import com.java110.dto.user.UserAddressDto;
+import com.java110.po.user.UserAddressPo;
import com.java110.user.bmo.userAddress.IDeleteUserAddressBMO;
import com.java110.user.bmo.userAddress.IGetUserAddressBMO;
import com.java110.user.bmo.userAddress.ISaveUserAddressBMO;
@@ -45,12 +45,13 @@
Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
Assert.hasKeyAndValue(reqJson, "areaCode", "璇锋眰鎶ユ枃涓湭鍖呭惈areaCode");
+ Assert.hasKeyAndValue(reqJson, "postalCode", "璇锋眰鎶ユ枃涓湭鍖呭惈postalCode");
Assert.hasKeyAndValue(reqJson, "tel", "璇锋眰鎶ユ枃涓湭鍖呭惈tel");
Assert.hasKeyAndValue(reqJson, "address", "璇锋眰鎶ユ枃涓湭鍖呭惈address");
Assert.hasKeyAndValue(reqJson, "isDefault", "璇锋眰鎶ユ枃涓湭鍖呭惈isDefault");
-
UserAddressPo userAddressPo = BeanConvertUtil.covertBean(reqJson, UserAddressPo.class);
+ userAddressPo.setbId("-1");
return saveUserAddressBMOImpl.save(userAddressPo);
}
@@ -87,9 +88,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 +107,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