Merge remote-tracking branch 'origin/develop'

master
james.zhao 6 years ago
commit 2aaca574cd

@ -5,6 +5,7 @@ import au.com.royalpay.payment.channels.wechat.config.WeChatPayConfig;
import au.com.royalpay.payment.channels.wechat.config.WechatPayEnvironment; import au.com.royalpay.payment.channels.wechat.config.WechatPayEnvironment;
import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi; import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi;
import au.com.royalpay.payment.channels.wechat.runtime.beans.SettlementLog; import au.com.royalpay.payment.channels.wechat.runtime.beans.SettlementLog;
import au.com.royalpay.payment.core.exceptions.ChannelNetworkException;
import au.com.royalpay.payment.manage.analysis.core.PlatformClearService; import au.com.royalpay.payment.manage.analysis.core.PlatformClearService;
import au.com.royalpay.payment.manage.analysis.mappers.EstimateAnalysisMapper; import au.com.royalpay.payment.manage.analysis.mappers.EstimateAnalysisMapper;
import au.com.royalpay.payment.manage.mappers.log.PlatformSettlementMapper; import au.com.royalpay.payment.manage.mappers.log.PlatformSettlementMapper;
@ -103,6 +104,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
doVerifyAlipayOnlineSettleLog(sdfClear.parse(end_date)); doVerifyAlipayOnlineSettleLog(sdfClear.parse(end_date));
} catch (Exception e) { } catch (Exception e) {
logger.error("PlatformClearAnalysisServiceImpl.verifySettleLogByDate ==> 校验" + end_date + "支付宝Online到账失败", e); logger.error("PlatformClearAnalysisServiceImpl.verifySettleLogByDate ==> 校验" + end_date + "支付宝Online到账失败", e);
throw new ChannelNetworkException("校验失败:",e);
} }
} }
if (StringUtils.equals("Wechat", channel)) { if (StringUtils.equals("Wechat", channel)) {

Loading…
Cancel
Save