zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-05-15 14:01:37 +08:00
parent fead9e2468 dd10365ca5
commit ca1b104ad6
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/peanut/modules/common/controller/UserAddressController.java
View File

@@ -41,9 +41,8 @@ public class UserAddressController {
*/
@RequestMapping("/save")
public R save(@RequestBody UserAddress userAddress) {
// 判断是否已经有默认的地址了
if ((userAddressService.getUserDefaultAddressCount(userAddress.getUserId()) >= 1) && userAddress.getIsDefault() == 1) {
return R.error("已经存在默认地址");
if (userAddress.getIsDefault()==1){
userAddressService.clearUserDefaultAddress(userAddress.getUserId());
}
if(userAddress.getRegionCode()==null||userAddress.getRegionCode().equals("")){
return R.error("地址异常添加失败！");
@@ -58,14 +57,8 @@ public class UserAddressController {
@RequestMapping("/update")
public R update(@RequestBody UserAddress userAddress) {
LambdaQueryWrapper<UserAddress> wrapper = new LambdaQueryWrapper();
wrapper.eq(UserAddress::getId,userAddress.getId());
wrapper.eq(UserAddress::getIsDefault,1);
UserAddress ua = userAddressService.getOne(wrapper);
if (ua == null){
if ((userAddressService.getUserDefaultAddressCount(userAddress.getUserId()) >= 1) && userAddress.getIsDefault() == 1) {
return R.error("已经存在默认地址");
}
if (userAddress.getIsDefault()==1){
userAddressService.clearUserDefaultAddress(userAddress.getUserId());
}
String str = userAddress.getConsigneeName()+userAddress.getConsigneePhone()+userAddress.getDetailAddress();
if(str.contains("+")||str.contains("&")){

2
src/main/java/com/peanut/modules/common/service/UserAddressService.java
View File

@@ -12,6 +12,6 @@ public interface UserAddressService extends IService<UserAddress> {
UserAddressVo getAddressName(UserAddressVo vo, String regionCode);
int getUserDefaultAddressCount(Integer userId);
boolean clearUserDefaultAddress(Integer userId);
}

6
src/main/java/com/peanut/modules/common/service/impl/UserAddressServiceImpl.java
View File

@@ -63,10 +63,12 @@ public class UserAddressServiceImpl extends ServiceImpl<UserAddressDao, UserAddr
return vo;
}
public int getUserDefaultAddressCount(Integer userId) {
public boolean clearUserDefaultAddress(Integer userId) {
QueryWrapper<UserAddress> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userId);
queryWrapper.eq("is_default", 1);
return this.count(queryWrapper);
UserAddress userAddress = this.getOne(queryWrapper);
userAddress.setIsDefault(0);
return this.updateById(userAddress);
}
}