Commit 5b0cc50c authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.2' into MVP1.7.2

parents 69d67ee7 2a5a6886
...@@ -110,8 +110,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -110,8 +110,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
try { try {
//到账通知交易流水查询 //到账通知交易流水查询
response = client.execute(request); response = client.execute(request);
log.error("到账通知交易流水状态" + response.getStatus()); log.info("到账通知交易流水状态" + response.getStatus());
log.error("到账通知交易流水结果" + response.getErrordesc()); log.info("到账通知交易流水结果" + response.getErrordesc());
if ("00".equals(response.getStatus())) { if ("00".equals(response.getStatus())) {
return R.ok(response.getDatalist()); return R.ok(response.getDatalist());
} else { } else {
...@@ -141,12 +141,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -141,12 +141,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
log.info("开始推昨日新增网银到账明细条数"); log.info("开始推昨日新增网银到账明细条数");
String tranDate = DateUtil.addDay(-1).replace("-",""); String tranDate = DateUtil.addDay(-1).replace("-","");
// todo 原代码 String beginDate = tranDate;
//String beginDate = tranDate; String endDate = tranDate;
//String endDate = tranDate;
String beginDate = "20241122";
String endDate = "20241122";
return getIcbcTransactionFlowCommon(tranDate,beginDate,endDate); return getIcbcTransactionFlowCommon(tranDate,beginDate,endDate);
} }
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</springProfile> </springProfile>
<springProfile name="test"> <springProfile name="test">
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="error"> <root level="info">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
......
...@@ -673,7 +673,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -673,7 +673,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
public void receiveOrderNew(InputStream inputStream, String file1, String orderNo, String fileName, String originalFileName,String fileIds){ public void receiveOrderNew(InputStream inputStream, String file1, String orderNo, String fileName, String originalFileName,String fileIds){
R<Object> e; R<Object> e;
if (file1.equals("fileZero")) { if (file1.equals("fileZero")) {
getObjectR(inputStream, orderNo, fileName, originalFileName,CommonConstants.TWO_INTEGER,fileIds); getObjectR(inputStream, orderNo, fileName, originalFileName,CommonConstants.ZERO_INTEGER,fileIds);
} }
if (file1.equals("fileOne")) { if (file1.equals("fileOne")) {
getObjectR(inputStream, orderNo, fileName, originalFileName,CommonConstants.TWO_INTEGER,fileIds); getObjectR(inputStream, orderNo, fileName, originalFileName,CommonConstants.TWO_INTEGER,fileIds);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment