Commit 3ad8d2b4 authored by jim's avatar jim

error

parent 4d090d85
...@@ -205,7 +205,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -205,7 +205,7 @@ public class AccountServiceImpl implements AccountService {
PrePaidBillingPageResultDto prePaidBillingPageResultDto = new PrePaidBillingPageResultDto(); PrePaidBillingPageResultDto prePaidBillingPageResultDto = new PrePaidBillingPageResultDto();
prePaidBillingPageResultDto.setBillingList(userPrePaidBillings.getContent()); prePaidBillingPageResultDto.setBillingList(userPrePaidBillings.getContent());
PageInfo pageInfo = new PageInfo(); PageInfo pageInfo = new PageInfo();
pageInfo.setTotalItems((int)userPrePaidBillings.getTotalElements()); pageInfo.setTotalItems((int) userPrePaidBillings.getTotalElements());
pageInfo.setTotalPages(userPrePaidBillings.getTotalPages()); pageInfo.setTotalPages(userPrePaidBillings.getTotalPages());
pageInfo.setCurrentPage(userPrePaidBillings.getNumber()); pageInfo.setCurrentPage(userPrePaidBillings.getNumber());
prePaidBillingPageResultDto.setBillingPage(pageInfo); prePaidBillingPageResultDto.setBillingPage(pageInfo);
...@@ -241,7 +241,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -241,7 +241,7 @@ public class AccountServiceImpl implements AccountService {
bill.setAdministrator(account.getParent()); bill.setAdministrator(account.getParent());
else else
bill.setAdministrator(account.getName()); bill.setAdministrator(account.getName());
bill.setTradeNo(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())+ SmsUtils.createRandom(true, 4)); bill.setTradeNo(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + SmsUtils.createRandom(true, 4));
bill.setChargeType(requestDto.getChargeType()); bill.setChargeType(requestDto.getChargeType());
bill.setAmount(requestDto.getAmount()); bill.setAmount(requestDto.getAmount());
bill.setUnit(requestDto.getUnit()); bill.setUnit(requestDto.getUnit());
...@@ -402,11 +402,11 @@ public class AccountServiceImpl implements AccountService { ...@@ -402,11 +402,11 @@ public class AccountServiceImpl implements AccountService {
for (Account promote : promotes) { for (Account promote : promotes) {
List<UserPrePaidBilling> userPrePaidBillings = prePaidBillingRepository.findByUsernameAndYearAndMonthAndPayMethodIn(promote.getName(), List<UserPrePaidBilling> userPrePaidBillings = prePaidBillingRepository.findByUsernameAndYearAndMonthAndPayMethodIn(promote.getName(),
YearMonth.now().getYear(), YearMonth.now().getYear(),
YearMonth.now().getMonthValue(), Arrays.asList(1,2,3)); YearMonth.now().getMonthValue(), Arrays.asList(1, 2, 3));
totalCommission += userPrePaidBillings.stream().mapToDouble(UserPrePaidBilling::getTotal).sum(); totalCommission += userPrePaidBillings.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
} }
account.getPromotion().setCommission((int)totalCommission); account.getPromotion().setCommission((int) totalCommission);
account.getPromotion().setInvitedUsers(invitedUsers); account.getPromotion().setInvitedUsers(invitedUsers);
repository.save(account); repository.save(account);
...@@ -414,7 +414,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -414,7 +414,7 @@ public class AccountServiceImpl implements AccountService {
resultDto.setStatus(0); resultDto.setStatus(0);
resultDto.setData(current); resultDto.setData(current);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage()); log.error(e.getMessage(), e);
resultDto.setStatus(-1); resultDto.setStatus(-1);
Map<String, Object> statusInfo = new HashMap<>(); Map<String, Object> statusInfo = new HashMap<>();
statusInfo.put("code", AccountErrorCode.NAMENOTEXIST); statusInfo.put("code", AccountErrorCode.NAMENOTEXIST);
...@@ -501,7 +501,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -501,7 +501,7 @@ public class AccountServiceImpl implements AccountService {
Account pExisting = null; Account pExisting = null;
String random = null; String random = null;
do { do {
random = String.valueOf((int)((Math.random()*9+1)*100000)); random = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
pExisting = repository.findByPromotion(random); pExisting = repository.findByPromotion(random);
} while (pExisting != null); } while (pExisting != null);
...@@ -561,7 +561,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -561,7 +561,7 @@ public class AccountServiceImpl implements AccountService {
if (StringUtils.isEmpty(parentName)) { if (StringUtils.isEmpty(parentName)) {
account.setAllowedToCreateSubUser(true); account.setAllowedToCreateSubUser(true);
account.setPermission(Integer.valueOf("1111",2)); account.setPermission(Integer.valueOf("1111", 2));
} else { } else {
account.setAllowedToCreateSubUser(user.isAllowedToCreateSubUser()); account.setAllowedToCreateSubUser(user.isAllowedToCreateSubUser());
account.setPermission(user.getPermission()); account.setPermission(user.getPermission());
...@@ -653,7 +653,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -653,7 +653,7 @@ public class AccountServiceImpl implements AccountService {
subUserPageResultDto.setUserList(subUsersDtoList); subUserPageResultDto.setUserList(subUsersDtoList);
PageInfo pageInfo = new PageInfo(); PageInfo pageInfo = new PageInfo();
pageInfo.setTotalItems((int)accounts.getTotalElements()); pageInfo.setTotalItems((int) accounts.getTotalElements());
pageInfo.setCurrentPage(accounts.getNumber()); pageInfo.setCurrentPage(accounts.getNumber());
pageInfo.setTotalPages(accounts.getTotalPages()); pageInfo.setTotalPages(accounts.getTotalPages());
subUserPageResultDto.setUserPage(pageInfo); subUserPageResultDto.setUserPage(pageInfo);
...@@ -717,7 +717,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -717,7 +717,7 @@ public class AccountServiceImpl implements AccountService {
return account; return account;
} }
public static String makeRandomPassword(int len){ public static String makeRandomPassword(int len) {
char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890".toCharArray(); char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890".toCharArray();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Random r = new Random(); Random r = new Random();
...@@ -747,7 +747,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -747,7 +747,7 @@ public class AccountServiceImpl implements AccountService {
AccountDto user = new AccountDto(); AccountDto user = new AccountDto();
if (i < 10) if (i < 10)
user.setName(existing.getName() + "00" + i); user.setName(existing.getName() + "00" + i);
else if (i< 100) else if (i < 100)
user.setName(existing.getName() + "0" + i); user.setName(existing.getName() + "0" + i);
else else
user.setName(existing.getName() + i); user.setName(existing.getName() + i);
...@@ -823,7 +823,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -823,7 +823,7 @@ public class AccountServiceImpl implements AccountService {
@Override @Override
public void saveSubUsers(String name, SubUsersRequestDto subUsersRequestDto) { public void saveSubUsers(String name, SubUsersRequestDto subUsersRequestDto) {
for (String username: subUsersRequestDto.getUsernames()) { for (String username : subUsersRequestDto.getUsernames()) {
Account childAccount = repository.findByName(username); Account childAccount = repository.findByName(username);
if (childAccount == null || !name.equals(childAccount.getParent())) { if (childAccount == null || !name.equals(childAccount.getParent())) {
throw new ClientRequestException(AccountErrorCode.UNKNOWN, "Invalid Request"); throw new ClientRequestException(AccountErrorCode.UNKNOWN, "Invalid Request");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment