Merge branch 'dev-zrj' into 'staging'

bug修改

See merge request !11

src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java

@@ -395,15 +395,18 @@ public class AdministratorServiceImpl implements AdministratorService {
             Date dateTime2 = formatter.parse(strDate2);
             Page<Account> accountPage = accountRepository.findAllBySignupDateBetweenAndPromotionCodeAndParentIsNull(pageable, dateTime1, dateTime2, account.getPromotion().getCode());
             List<AccountPromotionDto> accountPromotionDtos = new ArrayList<>();
+            if (accountPage.getNumber() > 0) {
                 accountPage.get().forEach(account1 -> {
                     accountPromotionDtos.add(new AccountPromotionDto(account1));
                 });
+            }
             Page<AccountPromotionDto> accountPromotionDtoPage = new PageImpl<AccountPromotionDto>(accountPromotionDtos);
             promotionQueryResultDto.setUsers(accountPromotionDtoPage);
 
             List<Account> accounts = accountRepository.findAllBySignupDateBetweenAndPromotionCode(dateTime1, dateTime2, account.getPromotion().getCode());
             Promotion promotion = new Promotion();
             Account finalAccount = account;
+            if (accounts != null && accounts.size() > 0) {
                 accounts.forEach(x -> {
                     promotion.setInvitedUsers(promotion.getInvitedUsers() + 1);
                     List<UserPrePaidBilling> userPrePaidBillings = userPrePaidBillingRepository.findByAdministratorAndPayMethodInAndTimestampBetween(x.getName(), Arrays.asList(1,2,3), dateTime1.getTime(), dateTime2.getTime());
@@ -425,6 +428,7 @@ public class AdministratorServiceImpl implements AdministratorService {
                                 List<UserPrePaidBilling> userPrePaidBillings1 = userPrePaidBillingRepository.findByAdministratorAndYearAndMonthAndPayMethodIn(secondPromote.getName(),
                                         YearMonth.now().minusMonths(1).getYear(),
                                         YearMonth.now().minusMonths(1).getMonthValue(), Arrays.asList(1,2,3));
+                                if (userPrePaidBillings1 != null && userPrePaidBillings1.size() > 0)
                                     secondCommission += userPrePaidBillings1.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
                             }
                         }
@@ -433,6 +437,7 @@ public class AdministratorServiceImpl implements AdministratorService {
                     promotion.setGift(promotion.getGift() + x.getPromotion().getGift());
                     promotion.setCommissionLastMonth(promotion.getCommissionLastMonth() + x.getPromotion().getCommissionLastMonth());
                 });
+            }
             promotionQueryResultDto.setPromotion(promotion);
 
             return promotionQueryResultDto;