msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
master
luoyang 6 years ago
parent 7e9b36605c
commit 36facdf46c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -2049,7 +2049,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
JSONObject cbBankPayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "CB_BankPay"); JSONObject cbBankPayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "CB_BankPay");
if (cbBankPayRate != null) { if (cbBankPayRate != null) {
result.put("cbbank_rate", cbBankPayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); client.put("cbbank_rate", cbBankPayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN));
} }
} catch (Exception ignored) { } catch (Exception ignored) {
throw new BadRequestException("Merchant Rate Not Configure"); throw new BadRequestException("Merchant Rate Not Configure");
@ -2059,15 +2059,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
if (bankAccount == null || bankAccount.size() <= 0) { if (bankAccount == null || bankAccount.size() <= 0) {
throw new BadRequestException("The Partner's Account is not config!"); throw new BadRequestException("The Partner's Account is not config!");
} }
result.put("bank", bankAccount.getString("bank")); client.put("bank", bankAccount.getString("bank"));
result.put("bsb_no", bankAccount.getString("bsb_no")); client.put("bsb_no", bankAccount.getString("bsb_no"));
result.put("account_no", bankAccount.getString("account_no")); client.put("account_no", bankAccount.getString("account_no"));
result.put("account_name", bankAccount.getString("account_name")); client.put("account_name", bankAccount.getString("account_name"));
String start_date = DateFormatUtils.format(new Date(), "dd/MM/yyyy"); String start_date = DateFormatUtils.format(new Date(), "dd/MM/yyyy");
result.put("start_date", start_date); client.put("start_date", start_date);
Date endDate = TimeZoneUtils.nextYearByCurrDay(); Date endDate = TimeZoneUtils.nextYearByCurrDay();
String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy"); String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy");
result.put("end_date", end_date); client.put("end_date", end_date);
return client; return client;
} }

Write Preview
Loading…
Cancel
Save