From a1d6638c3dad0a2c42aa3f35b0c080738f69bd9b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 15 一月 2024 19:05:39 +0800
Subject: [PATCH] 调整上海接口数据实时性

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

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 cf153a7..02678bf 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -117,7 +117,9 @@
                 //榛樿涓�涓殢渚垮��
                 apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
 
-                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
+                if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+                    sysData.setUserId("410183199003187055");
+                }
 
                 //鑾峰彇閫氱煡鍗曚俊鎭紝鏌ヨ鍚堝悓鍙峰拰璁″垝鏄庣粏鍙�
                 listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -130,7 +132,7 @@
                         }
                     }
                     if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                        api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+                        api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
                         if(null != api1404List && api1404List.size() > 0){
                             apiData.setJhmxh(api1404List.get(0).getJhmxdh());
                         }
@@ -231,6 +233,9 @@
 
                     int idNum = Integer.valueOf(sysData.getId().substring(12)) * 100 + 10001;
                     for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+                        if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
+                            continue;
+                        }
                         if (fz40InoutRecordItem.getSettleWeight() <= 0) {
                             continue;
                         }
@@ -238,6 +243,8 @@
                         apiData.setMz(fz40InoutRecordItem.getFullWeight());
                         apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                         apiData.setJz(fz40InoutRecordItem.getSettleWeight());
+                        apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+                        apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
                         api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                         if (null == api1202List || api1202List.isEmpty()) {
                             apiData.setCzbz(Constant.CZBZ_I);

--
Gitblit v1.9.3