From d47830f7f99040ab54b53c15cdc6e308b0348aad Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 22 Mar 2018 20:20:07 +0800 Subject: [PATCH] find settle to --- .../mappers/payment/TransactionMapper.java | 4 ++-- .../core/impls/ManualSettleSupportImpl.java | 24 ++++++++++++++++++- .../mappers/payment/TransactionMapper.xml | 2 +- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index f6b91f73c..2c5b2a05e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -96,7 +96,7 @@ public interface TransactionMapper { List listTransactionsForReferrerCommission(@Param("year") int year, @Param("month") int month); - List listTransactionsForAgentCommission(@Param("year") int year, @Param("month") int month,@Param("parent_org_id") int parent_org_id); + List listTransactionsForAgentCommission(@Param("year") int year, @Param("month") int month, @Param("parent_org_id") int parent_org_id); BigDecimal checkBalance(@Param("end") Date endDate); @@ -128,6 +128,6 @@ public interface TransactionMapper { List getClientRank(@Param("begin") Date begin, @Param("end") Date end); - List listClientUnsettleDataByDate(@Param("client_id") int clientId); + List listClientUnsettleDataByDate(@Param("client_id") int clientId, @Param("max_settle_to") Date maxSettleTo); } diff --git a/src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java index 3d34494e0..5506d4736 100644 --- a/src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java @@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.settlement.core.impls; import au.com.royalpay.payment.manage.mappers.log.ClearingLogMapper; import au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper; import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper; +import au.com.royalpay.payment.manage.mappers.system.CalendarMapper; import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper; import au.com.royalpay.payment.manage.settlement.core.ManualSettleSupport; import au.com.royalpay.payment.tools.exceptions.BadRequestException; @@ -18,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -37,6 +39,8 @@ public class ManualSettleSupportImpl implements ManualSettleSupport { private ClearingLogMapper clearingLogMapper; @Resource private ClientAccountMapper clientAccountMapper; + @Resource + private CalendarMapper calendarMapper; @Override public JSONObject requestManualSettle(Date settleTo, String accountId) { @@ -69,6 +73,9 @@ public class ManualSettleSupportImpl implements ManualSettleSupport { if (!client.getBooleanValue("manual_settle")) { throw new ForbiddenException("Manual Settlement Not Enabled"); } + if (client.getBooleanValue("skip_clearing")){ + throw new ForbiddenException("Manual Settlement Not Enabled"); + } JSONObject todayTask = taskManualSettleMapper.findTodayTask(clientId); if (todayTask != null) { todayTask.put("settle_to", DateFormatUtils.format(todayTask.getDate("settle_to"), "yyyy-MM-dd")); @@ -79,7 +86,8 @@ public class ManualSettleSupportImpl implements ManualSettleSupport { //今天未清算则锁定 todayTask.put("locked", settleLogs.isEmpty()); if (includingUnsettleData) { - List unsettleReports = transactionMapper.listClientUnsettleDataByDate(clientId); + Date end = findSettleTo(clientId); + List unsettleReports = transactionMapper.listClientUnsettleDataByDate(clientId, end); unsettleReports.parallelStream().forEach(report -> { report.put("clearing_amount", CurrencyAmountUtils.scalePlatformCurrency(report.getBigDecimal("clearing_amount"))); BigDecimal settleAmount = report.getBigDecimal("settle_amount"); @@ -96,4 +104,18 @@ public class ManualSettleSupportImpl implements ManualSettleSupport { } return todayTask; } + + private Date findSettleTo(int clientId) { + Date today = DateUtils.truncate(new Date(), Calendar.DATE); + JSONObject rateConfig = merchantInfoProvider.clientCurrentRate(clientId, today, "Wechat"); + int cleanDays = rateConfig.getIntValue("clean_days"); + List settleDateRange = calendarMapper.findClearingDateRange(today, cleanDays - 1); + Date end; + if (settleDateRange.size() < 2) { + end = DateUtils.addDays(today, -cleanDays); + } else { + end = DateUtils.addDays(settleDateRange.get(0), -1); + } + return end; + } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 0ee0981d6..d2215f2a0 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -750,7 +750,7 @@ sum(if(transaction_type = 'Credit', clearing_amount, -clearing_amount)) clearing_amount, sum(if(transaction_type = 'Credit', settle_amount, -settle_amount)) settle_amount FROM pmt_transactions t - WHERE t.client_id = #{client_id} AND t.clearing_status = 0 + WHERE t.client_id = #{client_id} AND t.clearing_status = 0 AND date(t.transaction_time)<=date(#{max_settle_to}) GROUP BY trans_date ORDER BY trans_date DESC