|
|
|
@@ -8,6 +8,7 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.enums.EnumInvestUserType; |
|
|
|
import com.iformall.enums.EnumMallUserStatus; |
|
|
|
import com.iformall.enums.EnumUserAdmin; |
|
|
|
import com.iformall.mapper.WxMallBuildingMapper; |
|
|
|
import com.iformall.mapper.WxMallFloorMapper; |
|
|
|
@@ -306,7 +307,7 @@ public class WxMallServiceImpl implements WxMallService { |
|
|
|
userInfo.setUsername(wxMall.getAdminUsername()); |
|
|
|
userInfo.setPhone(wxMall.getAdminPhone()); |
|
|
|
userInfo.setPassword(wxMall.getAdminPassword()); |
|
|
|
userInfo.setStatus(wxMall.getAdminStatus()); |
|
|
|
|
|
|
|
if(userInfo.getId() == null){ |
|
|
|
if(userInfoService.cntByUserName(userInfo.getUsername()) > 0){ |
|
|
|
return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); |
|
|
|
@@ -322,6 +323,7 @@ public class WxMallServiceImpl implements WxMallService { |
|
|
|
passwordHelper.encryptPassword(userInfo); |
|
|
|
userInfo.setIsAdmin(EnumUserAdmin.ADMIN.getCode()); |
|
|
|
userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); |
|
|
|
userInfo.setStatus(EnumMallUserStatus.VALID.getCode()); |
|
|
|
}else{ |
|
|
|
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); |
|
|
|
if(oldUser == null){ |
|
|
|
|