Просмотр исходного кода

Merge branch 'release_real_20211001' of https://git.malls.iformall.com/server/formallProject into release_real_20211001

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
a9037a3666
2 измененных файлов: 7 добавлений и 0 удалений
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/UserBasicInfoAddressServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/UserBasicInfoAddressController.java Просмотреть файл

@@ -53,6 +53,9 @@ public class UserBasicInfoAddressController extends BaseController {
if(userBasicInfoAddress == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
if(userBasicInfoAddress.getUserId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
}
userBasicInfoAddress.undateFinalTenantId(ifParentUpdateTenantInfo());
userBasicInfoAddressService.saveOrUpdate(userBasicInfoAddress);
return new ResultData();


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/UserBasicInfoAddressServiceImpl.java Просмотреть файл

@@ -8,6 +8,7 @@ import com.iformall.common.IdWorker;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.mapper.*;
import com.iformall.service.*;
import org.slf4j.Logger;
@@ -46,6 +47,9 @@ public class UserBasicInfoAddressServiceImpl implements UserBasicInfoAddressServ
record.setUpdateDate(now);
userBasicInfoAddressMapper.updateById(record);
}
if(record.getIsDefault() != null && record.getIsDefault().equals(EnumYesOrNo.YES.getCode())){
userBasicInfoAddressMapper.updateUnDefault(record);
}
}

@Override


Загрузка…
Отмена
Сохранить