Merge branch 'dev-zrj' into 'staging'

Dev zrj

See merge request !137

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -3,6 +3,7 @@ package com.edgec.browserbackend.account.controller;
 
 import com.edgec.browserbackend.account.dto.BillQueryResultDto;
 import com.edgec.browserbackend.account.dto.ResultDto;
+import com.edgec.browserbackend.account.dto.UserUsedDto;
 import com.edgec.browserbackend.account.service.*;
 import com.edgec.browserbackend.account.domain.*;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
@@ -206,7 +207,7 @@ public class AdministratorController {
     // 查询所有用户消费
     @PreAuthorize(Securitys.ADMIN_EL)
     @RequestMapping(path = "/0xadministrator/allused", method = RequestMethod.GET)
-    public Page<UserBalance> findAllused(@RequestParam(value="page")int page , @RequestParam(value="size")int size) {
+    public Page<UserUsedDto> findAllused(@RequestParam(value="page")int page , @RequestParam(value="size")int size) {
         Pageable pageable = PageRequest.of(page, size);
         return administratorService.getAllUserUsed(pageable);
     }

src/main/java/com/edgec/browserbackend/account/dto/UserUsedDto.java

+package com.edgec.browserbackend.account.dto;
+
+import com.edgec.browserbackend.account.domain.UserBalance;
+
+public class UserUsedDto {
+    UserBalance userBalance;
+    String promotionCode;
+
+    public String getPromotionCode() {
+        return promotionCode;
+    }
+
+    public void setPromotionCode(String promotionCode) {
+        this.promotionCode = promotionCode;
+    }
+
+    public UserBalance getUserBalance() {
+        return userBalance;
+    }
+
+    public void setUserBalance(UserBalance userBalance) {
+        this.userBalance = userBalance;
+    }
+}

src/main/java/com/edgec/browserbackend/account/service/AdministratorService.java

@@ -4,6 +4,7 @@ import com.edgec.browserbackend.account.domain.*;
 import com.edgec.browserbackend.account.dto.BillQueryResultDto;
 import com.edgec.browserbackend.account.dto.IpCountQueryResultDto;
 import com.edgec.browserbackend.account.dto.PromotionQueryResultDto;
+import com.edgec.browserbackend.account.dto.UserUsedDto;
 import com.edgec.browserbackend.browser.domain.IpResource;
 import com.edgec.browserbackend.browser.dto.IpResourceDto;
 import org.springframework.data.domain.Page;
@@ -66,5 +67,5 @@ public interface AdministratorService {
 
     File getProxyConfig();
 
-    Page<UserBalance> getAllUserUsed(Pageable pageable);
+    Page<UserUsedDto> getAllUserUsed(Pageable pageable);
 }

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

 package com.edgec.browserbackend.account.service.impl;
 
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.account.dto.AccountPromotionDto;
-import com.edgec.browserbackend.account.dto.BillQueryResultDto;
-import com.edgec.browserbackend.account.dto.IpCountQueryResultDto;
-import com.edgec.browserbackend.account.dto.PromotionQueryResultDto;
+import com.edgec.browserbackend.account.dto.*;
 import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.account.repository.*;
 import com.edgec.browserbackend.account.service.AdministratorService;
@@ -36,6 +33,7 @@ import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -454,11 +452,21 @@ public class AdministratorServiceImpl implements AdministratorService {
                     promotion.setCommission(promotion.getCommission() + x.getPromotion().getCommission());
                     double secondCommission = 0;
                     ipCount.addAndGet(ipResourceRepository.countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(x.getName(), false, Instant.now().toEpochMilli()));
+                    List<Account> children = accountRepository.findByParent(x.getName());
+                    if (children != null && children.size() > 0) {
+                        ipCount.addAndGet(ipResourceRepository.countAllByOwnerInAndIsDeletedAndValidTimeGreaterThan(children.stream().map(Account::getName).collect(Collectors.toList()), false, Instant.now().toEpochMilli()));
+                    }
                     if (finalAccount.getPromotion().isSale() && x.getParent() == null) {
                         List<Account> secondPromotes = accountRepository.findByPromotionCodeAndParentIsNull(x.getPromotion().getCode());
                         if (secondPromotes != null && secondPromotes.size() > 0) {
                             for (Account secondPromote : secondPromotes) {
-                                ipCount.addAndGet(ipResourceRepository.countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(secondPromote.getName(), false, Instant.now().toEpochMilli()));
+                                if (finalAccount.getPromotion().isSale()) {
+                                    ipCount.addAndGet(ipResourceRepository.countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(secondPromote.getName(), false, Instant.now().toEpochMilli()));
+                                    List<Account> secondChildren = accountRepository.findByParent(secondPromote.getName());
+                                    if (children != null && children.size() > 0) {
+                                        ipCount.addAndGet(ipResourceRepository.countAllByOwnerInAndIsDeletedAndValidTimeGreaterThan(secondChildren.stream().map(Account::getName).collect(Collectors.toList()), false, Instant.now().toEpochMilli()));
+                                    }
+                                }
                                 List<UserPrePaidBilling> userPrePaidBillings1 = userPrePaidBillingRepository.findByAdministratorAndPayMethodInAndTimestampBetween(secondPromote.getName(), Arrays.asList(1,2,3), dateTime1.getTime(), dateTime2.getTime());
                                 if (userPrePaidBillings1 != null && userPrePaidBillings1.size() > 0)
                                     secondCommission += userPrePaidBillings1.stream().mapToDouble(UserPrePaidBilling::getTotal).sum();
@@ -514,9 +522,21 @@ public class AdministratorServiceImpl implements AdministratorService {
     }
 
     @Override
-    public Page<UserBalance> getAllUserUsed(Pageable pageable) {
+    public Page<UserUsedDto> getAllUserUsed(Pageable pageable) {
         Page<UserBalance> userBalances = userBalanceRepository.findAllOrderByUsedDesc(pageable);
-        return userBalances;
+        List<UserBalance> userBalanceList = userBalances.toList();
+        List<UserUsedDto> userUsedDtos = new ArrayList<>();
+        if (userBalanceList != null && userBalanceList.size() > 0) {
+            userBalanceList.forEach(x -> {
+                UserUsedDto userUsedDto = new UserUsedDto();
+                Account account = accountRepository.findByName(x.getUsername());
+                userUsedDto.setPromotionCode(account.getPromotionCode());
+                userUsedDto.setUserBalance(x);
+                userUsedDtos.add(userUsedDto);
+            });
+        }
+        Page<UserUsedDto> userUsedDtopage = new PageImpl<>(userUsedDtos, pageable, userBalances.getTotalElements());
+        return userUsedDtopage;
     }
 
 }

src/main/java/com/edgec/browserbackend/browser/repository/IpResourceRepository.java

@@ -50,5 +50,6 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
     long countAllByIsDeletedAndValidTimeGreaterThan(boolean isDeleted, long time);
 
     long countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(String username, boolean isDeleted, long time);
+    long countAllByOwnerInAndIsDeletedAndValidTimeGreaterThan(List<String> username, boolean isDeleted, long time);
     long countAllByOwner(String username);
 }