用户消费

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

@@ -112,8 +112,8 @@ public class AdministratorController {
     //根据用户名查询用户账单tested
     @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(path ="/0xadministrator/searchuserbill/{name}",method = RequestMethod.GET)
-    public BillQueryResultDto getUserBillByName(@PathVariable String name){
-        return administratorService.getUserBillingByName(name);
+    public BillQueryResultDto getUserBillByName(@PathVariable String name, @RequestParam("page") int page, @RequestParam("size") int size){
+        return administratorService.getUserBillingByName(name, page, size);
     }
 
 

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

 package com.edgec.browserbackend.account.dto;
 
 import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
 public class BillQueryResultDto {
-    List<UserPrePaidBilling> userPrePaidBillingList;
+    Page<UserPrePaidBilling> userPrePaidBillingList;
     double totalExpense;
     double totalEarn;
 
@@ -25,11 +26,11 @@ public class BillQueryResultDto {
         this.totalExpense = totalExpense;
     }
 
-    public List<UserPrePaidBilling> getUserPrePaidBillingList() {
+    public Page<UserPrePaidBilling> getUserPrePaidBillingList() {
         return userPrePaidBillingList;
     }
 
-    public void setUserPrePaidBillingList(List<UserPrePaidBilling> userPrePaidBillingList) {
+    public void setUserPrePaidBillingList(Page<UserPrePaidBilling> userPrePaidBillingList) {
         this.userPrePaidBillingList = userPrePaidBillingList;
     }
 }

src/main/java/com/edgec/browserbackend/account/repository/UserPrePaidBillingRepository.java

@@ -18,6 +18,8 @@ public interface UserPrePaidBillingRepository extends MongoRepository<UserPrePai
 
     List<UserPrePaidBilling> findByUsername(String username);
 
+    Page<UserPrePaidBilling> findAllByUsername(String username, Pageable pageable);
+
     Page<UserPrePaidBilling> findAllByYearBetweenAndMonthBetween(Pageable pageable, int year1, int year2, int month1, int month2);
 
     List<UserPrePaidBilling> findByUsernameAndYearAndMonthAndPayMethodIsNot(String username, int year, int month, int payMethod);

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

@@ -23,7 +23,7 @@ public interface AdministratorService {
 
     Account getAccountByEmail(String target);
 
-    BillQueryResultDto getUserBillingByName(String name);
+    BillQueryResultDto getUserBillingByName(String name, int page, int size);
 
     Account unLockLockedAccount(String name, Account account);
 

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

@@ -105,8 +105,11 @@ public class AdministratorServiceImpl implements AdministratorService {
 
 
     @Override
-    public BillQueryResultDto getUserBillingByName(String name) {
-        List<UserPrePaidBilling> userBillingList = userPrePaidBillingRepository.findByUsername(name);
+    public BillQueryResultDto getUserBillingByName(String name, int page, int size) {
+        if (size > 100)
+            size = 100;
+        Pageable pageable = PageRequest.of(page, size);
+        Page<UserPrePaidBilling> userBillingList = userPrePaidBillingRepository.findAllByUsername(name, pageable);
         if (userBillingList == null)
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "Username does not exist: " + name);
         List<UserPrePaidBilling> userPrePaidBillings = userPrePaidBillingRepository.findByUsernameAndPayMethodIsNot(name, 0);