Skip to content

B
browser-backend
Commit 313cff66 authored by renjie's avatar renjie
Browse files
Options

费用明细bug

parent b9b234d2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @ 313cff66
...@@ -185,9 +185,9 @@ public class AccountServiceImpl implements AccountService { ...@@ -185,9 +185,9 @@ public class AccountServiceImpl implements AccountService {
userPrePaidBillings = prePaidBillingRepository.findByAdministratorAndTimestampGreaterThanAndChargeTypeOrderByTimestamp(name, time, 0, pageable); userPrePaidBillings = prePaidBillingRepository.findByAdministratorAndTimestampGreaterThanAndChargeTypeOrderByTimestamp(name, time, 0, pageable);
} else if (userPrePaidBillingRequestDto.getTradeType() == 2 || userPrePaidBillingRequestDto.getTradeType() == 3 || userPrePaidBillingRequestDto.getTradeType() == 4) { } else if (userPrePaidBillingRequestDto.getTradeType() == 2 || userPrePaidBillingRequestDto.getTradeType() == 3 || userPrePaidBillingRequestDto.getTradeType() == 4) {
if (account.getParent() != null) if (account.getParent() != null)
userPrePaidBillings = prePaidBillingRepository.findByUsernameAndTimestampGreaterThanAndChargeTypeIsNotAndPayMethodOrderByTimestamp(name, time, 0, 0, pageable); userPrePaidBillings = prePaidBillingRepository.findByUsernameAndTimestampGreaterThanAndChargeTypeIsNotAndPayMethodOrderByTimestamp(name, time, 0, userPrePaidBillingRequestDto.getTradeType() - 2, pageable);
else else
userPrePaidBillings = prePaidBillingRepository.findByAdministratorAndTimestampGreaterThanAndChargeTypeIsNotAndPayMethodOrderByTimestamp(name, time, 0, 0, pageable); userPrePaidBillings = prePaidBillingRepository.findByAdministratorAndTimestampGreaterThanAndChargeTypeIsNotAndPayMethodOrderByTimestamp(name, time, 0, userPrePaidBillingRequestDto.getTradeType() - 2, pageable);
} else { } else {
if (account.getParent() != null) if (account.getParent() != null)
userPrePaidBillings = prePaidBillingRepository.findByUsernameAndTimestampGreaterThanOrderByTimestamp(name, time, pageable); userPrePaidBillings = prePaidBillingRepository.findByUsernameAndTimestampGreaterThanOrderByTimestamp(name, time, pageable);
......
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