From 611a4eb646840d4362e74921d8ce9e74e2f4b08b Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 2 Aug 2018 23:10:34 +0800 Subject: [PATCH] fix --- .../payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java | 2 +- .../bdprize/support/impls/BDPrizeCalculatorDefaultImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index 8670ec2f6..e5624ca50 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -121,7 +121,7 @@ public class BDPrizeServiceImpl implements BDPrizeService { List trades = transactionMapper.listTransactionsForBDPrize(now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1, channel); List clientsWithBDAway = clientBDMapper.clientsWithBDAway(); List rateConfig = getRateConfig(); - BDPrizeCalculator calculator = new BDPrizeCalculatorDefaultImpl(trades, now.getTime()).clientBDMapper(clientBDMapper) + BDPrizeCalculator calculator = new BDPrizeCalculatorDefaultImpl(trades, now.getTime()).clientBDMapper(clientBDMapper,transactionMapper) .clientsWithBDAwayDeterminor(new DefaultClientWithBDAwayDeterminor(clientsWithBDAway)).rateConfig(rateConfig); calculator.calculate(); List report = calculator.getReport(now.get(Calendar.YEAR),now.get(Calendar.MONTH) + 1); diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/support/impls/BDPrizeCalculatorDefaultImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/support/impls/BDPrizeCalculatorDefaultImpl.java index be9df684f..08f842b21 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/support/impls/BDPrizeCalculatorDefaultImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/support/impls/BDPrizeCalculatorDefaultImpl.java @@ -38,8 +38,9 @@ public class BDPrizeCalculatorDefaultImpl implements BDPrizeCalculator { this.month = month; } - public BDPrizeCalculatorDefaultImpl clientBDMapper(ClientBDMapper clientBDMapper) { + public BDPrizeCalculatorDefaultImpl clientBDMapper(ClientBDMapper clientBDMapper,TransactionMapper transactionMapper) { this.clientBDMapper = clientBDMapper; + this.transactionMapper = transactionMapper; return this; }