|
|
@ -356,7 +356,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
private String agreetemplatePdfPath;
|
|
|
|
private String agreetemplatePdfPath;
|
|
|
|
@Value("${app.agreetemplate.aggregate.path}")
|
|
|
|
@Value("${app.agreetemplate.aggregate.path}")
|
|
|
|
private String aggregateAgreetemplatePdfPath;
|
|
|
|
private String aggregateAgreetemplatePdfPath;
|
|
|
|
private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf";
|
|
|
|
// private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf";
|
|
|
|
|
|
|
|
private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2021/09/07/1630997571126_fqWcLQ5Rx0wFm8pVwpKuI1gjf6FmwX.pdf";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
@ -2979,9 +2980,25 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
throw new BadRequestException("The Partner's Rate is not config!");
|
|
|
|
throw new BadRequestException("The Partner's Rate is not config!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("clean", "T+" + weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean", "T+"+weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean_days", weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean_days", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("located_country", "Australia");
|
|
|
|
|
|
|
|
if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
// clean_1 clean_1_friday clean_1_saturday
|
|
|
|
|
|
|
|
// second, third or fourth
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "first");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "second");
|
|
|
|
|
|
|
|
}else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "second");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "third");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "third");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "fourth");
|
|
|
|
|
|
|
|
}
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
JSONObject alipayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Alipay");
|
|
|
|
JSONObject alipayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Alipay");
|
|
|
|
if (alipayRate != null) {
|
|
|
|
if (alipayRate != null) {
|
|
|
@ -3011,6 +3028,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
|
|
|
|
client.put("client_contract_manager", clientLegal.getString("representative_person"));//client contract manager
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PdfUtils pdu = new PdfUtils();
|
|
|
|
PdfUtils pdu = new PdfUtils();
|
|
|
|
pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath);
|
|
|
|
pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath);
|
|
|
@ -3098,6 +3116,20 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("wechat_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("wechat_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("clean", "T+" + p.getString("clean_days"));
|
|
|
|
client.put("clean", "T+" + p.getString("clean_days"));
|
|
|
|
client.put("clean_days", p.getString("clean_days"));
|
|
|
|
client.put("clean_days", p.getString("clean_days"));
|
|
|
|
|
|
|
|
if("1".equalsIgnoreCase(p.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", p.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "first");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "second");
|
|
|
|
|
|
|
|
}else if("2".equalsIgnoreCase(p.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", p.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "second");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "third");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else if("3".equalsIgnoreCase(p.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", p.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "third");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "fourth");
|
|
|
|
|
|
|
|
}
|
|
|
|
} else if ("Alipay".equals(rate_name)) {
|
|
|
|
} else if ("Alipay".equals(rate_name)) {
|
|
|
|
client.put("alipay_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("alipay_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
} else if ("AlipayOnline".equals(rate_name)) {
|
|
|
|
} else if ("AlipayOnline".equals(rate_name)) {
|
|
|
@ -3115,12 +3147,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("account_name", account.getString("account_name"));
|
|
|
|
client.put("account_name", account.getString("account_name"));
|
|
|
|
String start_date = DateFormatUtils.format(new Date(), "dd/MM/yyyy");
|
|
|
|
String start_date = DateFormatUtils.format(new Date(), "dd/MM/yyyy");
|
|
|
|
client.put("start_date", start_date);
|
|
|
|
client.put("start_date", start_date);
|
|
|
|
|
|
|
|
client.put("located_country", "Australia");
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject clientLegal = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id"));
|
|
|
|
JSONObject clientLegal = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id"));
|
|
|
|
if (clientLegal != null) {
|
|
|
|
if (clientLegal != null) {
|
|
|
|
client.put("legal_person", clientLegal.getString("representative_person"));
|
|
|
|
client.put("legal_person", clientLegal.getString("representative_person"));
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
|
|
|
|
client.put("client_contract_manager", clientLegal.getString("representative_person"));//client contract manager
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PdfUtils pdu = new PdfUtils();
|
|
|
|
PdfUtils pdu = new PdfUtils();
|
|
|
|
pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath);
|
|
|
|
pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath);
|
|
|
@ -3169,6 +3204,23 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("clean", "T+" + weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean", "T+" + weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean_days", weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean_days", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("located_country", "Australia");
|
|
|
|
|
|
|
|
if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
// clean_1 clean_1_friday clean_1_saturday
|
|
|
|
|
|
|
|
// second, third or fourth
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "first");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "second");
|
|
|
|
|
|
|
|
}else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "second");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "third");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "third");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "fourth");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
JSONObject alipayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Alipay");
|
|
|
|
JSONObject alipayRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Alipay");
|
|
|
@ -3202,6 +3254,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
|
|
|
|
client.put("client_contract_manager", clientLegal.getString("representative_person"));//client contract manager
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PdfUtils pdu = new PdfUtils();
|
|
|
|
PdfUtils pdu = new PdfUtils();
|
|
|
|
pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath);
|
|
|
|
pdu.setTemplatePdfPath(aggregateAgreetemplatePdfPath);
|
|
|
@ -4052,6 +4105,23 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
|
|
|
|
client.put("clean", "T+" + weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean", "T+" + weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean_days", weChatRate.getString("clean_days"));
|
|
|
|
client.put("clean_days", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("located_country", "Australia");
|
|
|
|
|
|
|
|
if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
// clean_1 clean_1_friday clean_1_saturday
|
|
|
|
|
|
|
|
// second, third or fourth
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "first");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "second");
|
|
|
|
|
|
|
|
}else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "second");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "third");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){
|
|
|
|
|
|
|
|
client.put("clean_1", weChatRate.getString("clean_days"));
|
|
|
|
|
|
|
|
client.put("clean_1_friday", "third");
|
|
|
|
|
|
|
|
client.put("clean_1_saturday", "fourth");
|
|
|
|
|
|
|
|
}
|
|
|
|
String rateConfig = sysConfigManager.getSysConfig().getString("sys_rates");
|
|
|
|
String rateConfig = sysConfigManager.getSysConfig().getString("sys_rates");
|
|
|
|
JSONObject sysConfigRate = JSON.parseObject(rateConfig);
|
|
|
|
JSONObject sysConfigRate = JSON.parseObject(rateConfig);
|
|
|
|
|
|
|
|
|
|
|
@ -4098,6 +4168,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_job_title", clientLegal.getString("job_title"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_phone", clientLegal.getString("phone"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
client.put("legal_email", clientLegal.getString("email"));
|
|
|
|
|
|
|
|
client.put("client_contract_manager", clientLegal.getString("representative_person"));//client contract manager
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return exportImgAggregateFile(account, client);
|
|
|
|
return exportImgAggregateFile(account, client);
|
|
|
|
}
|
|
|
|
}
|
|
|
|