|
|
|
@ -1113,7 +1113,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
|
public JSONObject sendSettlementMail(Date date, List<String> clearIds, boolean autoMarkSent) {
|
|
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
|
try {
|
|
|
|
|
String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
|
|
|
|
|
String title = (PlatformEnvironment.getEnv().isDebug() ? "[TEST]" : "") + "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
|
|
|
|
|
JSONObject model = new JSONObject();
|
|
|
|
|
model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
|
|
|
|
|
String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd");
|
|
|
|
@ -1183,7 +1183,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
|
sendTaskFinishMessages(ManagerRole.FINANCIAL_STAFF, "清算文件已发送清算方", "发送清算通知");
|
|
|
|
|
if (autoMarkSent) {
|
|
|
|
|
if (!clearIds.isEmpty()) {
|
|
|
|
|
clearingLogMapper.lockSettlementsById(clearLogs.stream().map(log->log.getString("clearing_id")).collect(Collectors.toList()));
|
|
|
|
|
clearingLogMapper.lockSettlementsById(clearLogs.stream().map(log -> log.getString("clearing_id")).collect(Collectors.toList()));
|
|
|
|
|
} else {
|
|
|
|
|
clearingLogMapper.lockSettlements(date);
|
|
|
|
|
}
|
|
|
|
|