From 2f7b25914dae54442b3fe2f91bb0060fcfd81e96 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 09 十一月 2024 09:33:08 +0800
Subject: [PATCH] 宁夏接口升级V1.2-测试调整2
---
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index c93a2c7..ac7743c 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -246,7 +246,7 @@
BeanUtils.copyProperties(data, apiData);
//璁剧疆绲变竴浠撴埧缂栫爜
if (StringUtils.isEmpty(apiData.getTycfbm())) {
- String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
+ String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
apiData.setTycfbm(tycfbm);
}
//璁剧疆绲变竴寤掗棿鍚嶇О
@@ -326,7 +326,7 @@
}
//璁剧疆鏂囦欢娴�
apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
- //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜鍔犱笁缁撮『搴忓彿
+ //璁剧疆鏂囦欢鍚嶇О锛氱粺涓�搴撳尯缂栫爜_
if (apiData.getWjmc().startsWith(apiData.getKqdm())) {
apiData.setWjmc(apiData.getWjmc().replace(apiData.getKqdm(), apiData.getTykqbm()));
}
@@ -434,6 +434,10 @@
if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
}
+ //璁剧疆鍏ュ簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getRkjsdh().startsWith(api1202.getKqdm())) {
+ apiData.setRkjsdh(apiData.getRkjsdh().replace(api1202.getKqdm(), apiData.getTyhwbm().substring(0, 22)));
+ }
return apiData;
}
if (Constant.API_CODE_1203.equals(inteId)) {
@@ -485,6 +489,11 @@
if (apiData.getHth().startsWith(apiData.getHwdm().substring(0, 21))) {
apiData.setHth(apiData.getHth().replace(apiData.getHwdm().substring(0, 21), apiData.getTyhwbm().substring(0, 22)));
}
+ //璁剧疆鍑哄簱缁撶畻鍗曞彿锛氱粺涓�搴撳尯缂栫爜+yyyyMMdd+涓変綅椤哄簭鍙�
+ if (apiData.getCkjsdh().startsWith(apiData.getHwdm().substring(0, 21))) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getHwdm().substring(0, 21));
+ apiData.setCkjsdh(apiData.getCkjsdh().replace(apiData.getHwdm().substring(0, 21), tykqbm));
+ }
return apiData;
}
if (Constant.API_CODE_1206.equals(inteId)) {
@@ -509,12 +518,12 @@
BeanUtils.copyProperties(api1207, apiData);
//璁剧疆鍊掑嚭搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDckqtybm())) {
- String dckqtybm = apiCommonService.getTykqbm(apiData.getDchwdm().substring(0, 21));
+ String dckqtybm = apiCommonService.getTykqbm(apiData.getDcdw());
apiData.setDckqtybm(dckqtybm);
}
//璁剧疆鍊掑叆搴撳尯缁熶竴缂栫爜
if (StringUtils.isEmpty(apiData.getDrkqtybm())) {
- String drkqtybm = apiCommonService.getTykqbm(apiData.getDrhwdm().substring(0, 21));
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
apiData.setDrkqtybm(drkqtybm);
}
//璁剧疆鍊掑嚭璐т綅缁熶竴缂栫爜
@@ -544,7 +553,7 @@
}
//璁剧疆绮潈鍗曚綅绲变竴缂栫爜
if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
- String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
+ String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
apiData.setLqgstydwbm(tydwbm);
}
return apiData;
@@ -854,37 +863,37 @@
String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
apiData.setXkqdm(tykqbm);
}
- return data;
+ return apiData;
}
if (Constant.API_CODE_1505.equals(inteId)) {
SX2024Api1505 apiData = new SX2024Api1505();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1506.equals(inteId)) {
SX2024Api1506 apiData = new SX2024Api1506();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1507.equals(inteId)) {
SX2024Api1507 apiData = new SX2024Api1507();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1508.equals(inteId)) {
SX2024Api1508 apiData = new SX2024Api1508();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1509.equals(inteId)) {
SX2024Api1509 apiData = new SX2024Api1509();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
if (Constant.API_CODE_1510.equals(inteId)) {
SX2024Api1510 apiData = new SX2024Api1510();
BeanUtils.copyProperties(data, apiData);
- return data;
+ return apiData;
}
return data;
}
--
Gitblit v1.9.3