From 10a8ba5c72091636d96613986105fd97c8d9a41a Mon Sep 17 00:00:00 2001
From: tangft <32189@windows10.microdone.cn>
Date: Mon, 28 Jun 2021 15:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E7=9B=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tenwa/collectaudit/cache/CollectAuditInfoCache.java | 6 ++++++
 .../tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index f02ad38be..bf470c5a0 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -1010,6 +1010,9 @@ public class CollectAuditInfoCache {
 			for (int i = 1; i <= snArray.length; i++) {
 				
 				Map<String, String> map = querySingleBatchCollect(tx, bo, query_sn, snArray[(i-1)]);
+				if(map == null ) {
+					continue;
+				}
 				if (snArray.length == 1) {
 					if (map.containsKey("RET_CODE") && "0000".equals(map.get("RET_CODE"))) {
 						//核销
@@ -1222,6 +1225,9 @@ public class CollectAuditInfoCache {
 //					queryBatchXML(req_sn, query_sn, sn);
 			//响应报文
 			String strResp = cp.CollectAuditPayReq(strbuff,file.getAbsolutePath(), batch_title);
+			if(strResp==null || strResp.isEmpty()) {
+				return null;
+			}
 			Map<String, String> map = getRetAndCode(strResp);
 			//生成存盘、回盘文件
 			savaFile(tx, strResp,batch_title,bo);
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
index 6f6d317c3..16c5e87dc 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
@@ -1008,6 +1008,9 @@ public class CollectAuditInfoCacheTj {
 			for (int i = 1; i <= snArray.length; i++) {
 				
 				Map<String, String> map = querySingleBatchCollect(tx, bo, query_sn, snArray[(i-1)]);
+				if(map == null ) {
+					continue;
+				}
 				if (snArray.length == 1) {
 					if (map.containsKey("RET_CODE") && "0000".equals(map.get("RET_CODE"))) {
 						//核销
@@ -1220,6 +1223,9 @@ public class CollectAuditInfoCacheTj {
 //					queryBatchXML(req_sn, query_sn, sn);
 			//响应报文
 			String strResp = cp.CollectAuditPayReq(strbuff,file.getAbsolutePath(), batch_title);
+			if(strResp==null || strResp.isEmpty()) {
+				return null;
+			}
 			Map<String, String> map = getRetAndCode(strResp);
 			//生成存盘、回盘文件
 			savaFile(tx, strResp,batch_title,bo);