From f495e422b1de10b1d1810158fca1c63f9b60fe45 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 26 七月 2025 10:19:55 +0800
Subject: [PATCH] 调整品种获取
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 3 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 3 ---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 3 ---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1211.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 3 ---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 3 ---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 3 ---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 3 +--
10 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index afdcf4f..12ee22e 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -136,6 +136,9 @@
result = parentMap.get(bizCode);
if (null == result) {
+ result = parentMap.get(bizCode.substring(0, 3));
+ }
+ if (null == result) {
result = parentMap.get(DEFAULT_MAP_KEY);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 64f6465..2e2f386 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -120,9 +120,6 @@
}
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
- if(StringUtils.isEmpty(mappingCode)) {
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
- }
apiData.setLspzdm(mappingCode);
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 9052381..3722b72 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -179,9 +179,6 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
- if(StringUtils.isEmpty(mappingCode)) {
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
- }
apiData.setLspzdm(mappingCode);
//绮鎬ц川
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index c2c44b7..a9c142b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -203,9 +203,6 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
- if (StringUtils.isEmpty(mappingCode)) {
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
- }
apiData.setLspzdm(mappingCode);
//淇濈鍛樺鏍�
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 547816e..6bec7ee 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -156,9 +156,6 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
- if(StringUtils.isEmpty(mappingCode)) {
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
- }
apiData.setLspzdm(mappingCode);
//绮绛夌骇
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
index 2771377..03ab89d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -91,7 +91,7 @@
apiData.setTzdh(sysData.getNoticeId());
apiData.setDcdw(kqdm);
apiData.setDrdw(kqdm);
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
apiData.setDchwdm(api1105Out.getHwdm());
apiData.setDrhwdm(api1105In.getHwdm());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 1411f45..c28043c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -88,9 +88,6 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety());
- if(StringUtils.isEmpty(mappingCode)) {
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
- }
apiData.setLspzdm(mappingCode);
//绮鎬ц川
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
index b4a7093..88b74f2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -78,7 +78,7 @@
apiData.setLssl(sysData.getNumber());
apiData.setHzsl(sysData.getChangeNumber());
apiData.setBzwh(sysData.getApprovalId());
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setHzqlsxzdm(mappingCode);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1211.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1211.java
index 324d36c..98389bf 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1211.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1211.java
@@ -77,7 +77,7 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotBookStore.getLspzdm().substring(0, 3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotBookStore.getLspzdm());
apiData.setLspzdm(mappingCode);
//绮鎬ц川
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index e80e7d9..a6c334d 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -778,12 +778,11 @@
if (null == apiData.getBclbs()) {
api1208.setBclbs(0);
}
- if ("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0) {
+ if ("2".equals(apiData.getClfs())) {
api1208.setBclbs((int) (apiData.getSjsl() / 25));
api1208.setCplgg(25);
api1208.setCplbs(api1208.getBclbs());
}
-
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1208);
return api1208;
--
Gitblit v1.9.3