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