|
|
|
@ -12,18 +12,21 @@ import au.com.royalpay.payment.tools.locale.LocaleSupport;
|
|
|
|
|
import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
|
|
|
|
|
import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
|
|
|
|
|
import au.com.royalpay.payment.tools.utils.CurrencyAmountUtils;
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
|
|
import org.apache.commons.lang3.time.DateUtils;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Calendar;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create by yixian at 2018-03-20 17:44
|
|
|
|
|
*/
|
|
|
|
@ -73,7 +76,7 @@ public class ManualSettleSupportImpl implements ManualSettleSupport {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public JSONObject findCurrentSettle(int clientId, boolean includingUnsettleData) {
|
|
|
|
|
JSONObject client = merchantInfoProvider.getClientInfo(clientId);
|
|
|
|
|
JSONObject client = merchantInfoProvider.getClientInfoWithConfig(clientId);
|
|
|
|
|
if (!client.getBooleanValue("manual_settle")) {
|
|
|
|
|
throw new ForbiddenException("Manual Settlement Not Enabled");
|
|
|
|
|
}
|
|
|
|
|