diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java index 701eba6d6..3a6bb7011 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java @@ -63,6 +63,7 @@ import com.accompany.core.service.phone.PhoneAuthApplyRecordService; import com.accompany.core.service.region.RegionInfoService; import com.accompany.core.service.region.RegionService; import com.accompany.core.service.user.UsersBaseService; +import com.accompany.core.util.I18NMessageSourceUtil; import com.accompany.core.util.PartitionUtil; import com.accompany.core.vo.PrivatePhotoVo; import com.accompany.core.vo.UserLevelVo; @@ -960,8 +961,9 @@ public class UsersService extends BaseService { if (Long.parseLong(value) >= Constant.GrantError.PAY_PASSWORD) { return new BusiResult(BusiStatus.PAY_PASSWORD_LIMIT); } else { - String message = String.format(BusiStatus.PAY_PASSWORD_ERROR.getReasonPhrase(), - Constant.GrantError.PAY_PASSWORD - Long.parseLong(value)); + String i18nId = "BusiStatus.PAY_PASSWORD_ERROR"; + String i18nMsg = I18NMessageSourceUtil.getMessage(i18nId, BusiStatus.PAY_PASSWORD_ERROR.getMessage(), uid); + String message = String.format(i18nMsg, Constant.GrantError.PAY_PASSWORD - Long.parseLong(value)); return new BusiResult(BusiStatus.PAY_PASSWORD_ERROR, message); } } else { @@ -995,8 +997,9 @@ public class UsersService extends BaseService { if (Long.parseLong(value) >= Constant.GrantError.PAY_PASSWORD) { throw new ServiceException(BusiStatus.PAY_PASSWORD_LIMIT); } else { - String message = String.format(BusiStatus.PAY_PASSWORD_ERROR.getReasonPhrase(), - Constant.GrantError.PAY_PASSWORD - Long.parseLong(value)); + String i18nId = "BusiStatus.PAY_PASSWORD_ERROR"; + String i18nMsg = I18NMessageSourceUtil.getMessage(i18nId, BusiStatus.PAY_PASSWORD_ERROR.getMessage(), uid); + String message = String.format(i18nMsg, Constant.GrantError.PAY_PASSWORD - Long.parseLong(value)); throw new ServiceException(BusiStatus.PAY_PASSWORD_ERROR, message); } } else { @@ -1024,43 +1027,6 @@ public class UsersService extends BaseService { } - /** - * 更新指定的用户uid列表的状态为冻结或正常 - * - * @param usersWithBalances - * @param useStatus - * @return - */ - public int updateUserStatusByUidList(List usersWithBalances, int useStatus) { - List uidList = usersWithBalances.stream().map(Users::getUid).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(uidList)) { - log.info("uidList is empty"); - return 0; - } - int row = usersMapperExpend.updateUserStatusByUidList(uidList, useStatus); - log.info("uidList row:{},uidList:{},useStatus:{}", row, uidList, useStatus); - //记录冻结的日志入库 - Date updateTime = new Date(); - if (row > 0) { - List userFrozenRecords = new ArrayList<>(); - usersWithBalances.stream().forEach(user -> { - UserFrozenRecord userFrozenRecord = new UserFrozenRecord(); - userFrozenRecord.setStatus(Constant.UserStatus.FROZEN); - userFrozenRecord.setOperateTime(updateTime); - userFrozenRecord.setOperateReason("定时器操作,长时间未登录"); - userFrozenRecord.setUid(user.getUid()); - userFrozenRecord.setErbanNo(user.getErbanNo()); - userFrozenRecord.setNick(user.getNick()); - userFrozenRecord.setAdminName("定时器"); - userFrozenRecord.setAdminId(0); - userFrozenRecords.add(userFrozenRecord); - }); - int insertBatchRow = userFrozenRecordMapper.insertBatch(userFrozenRecords); - log.info("insertBatchRow:{}", insertBatchRow); - } - return row; - } - /** * 重置支付密码 *