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/Fzzy40Sync1205.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

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 7c917fe..1fc0158 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -105,12 +105,18 @@
             //璐т綅浠g爜
             apiData.setHwdm(api1105.getHwdm());
             apiData.setYwlx(Constant.INOUT_TYPE_1);
+            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
+            apiData.setCyr(sysData.getUserName());
+
+            //榛樿涓�涓殢渚垮��
+            apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
+
+            if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+                sysData.setUserId("410183199003187055");
+            }
 
             //閫氱煡鍗曞彿
             apiData.setCktzdh(sysData.getNoticeId());
-
-            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
-
             //鑾峰彇鍚堝悓鍙�
             listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
             if (null != listInoutNotice && listInoutNotice.size() > 0) {
@@ -122,7 +128,7 @@
                     }
                 }
                 if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
-                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+                    List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
                     if(null != api1404List && api1404List.size() > 0){
                         apiData.setJhmxh(api1404List.get(0).getJhmxdh());
                     }
@@ -210,6 +216,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;
                     }
@@ -217,6 +226,8 @@
                     apiData.setMz(fz40InoutRecordItem.getFullWeight());
                     apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                     apiData.setJz(fz40InoutRecordItem.getSettleWeight());
+                    apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+                    apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
 
                     api1205List = api1205Rep.getDataById(apiData.getCkywdh());
                     if(null == api1205List || api1205List.isEmpty()){

--
Gitblit v1.9.3