From da0dfffe0c57ed3ca0c66b24a68ccc64da0873c9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 19 十月 2023 20:19:51 +0800
Subject: [PATCH] 调整上海接口-船运时调整每车为一条数据

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
index 1974870..e1fa2fd 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
@@ -1,10 +1,12 @@
 package com.fzzy.async.fzzy35.impl;
 
 import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1101;
 import com.fzzy.api.entity.Api1102;
 import com.fzzy.api.entity.Api1212;
 import com.fzzy.api.entity.ApiLog;
 import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
 import com.fzzy.api.view.repository.Api1102Rep;
 import com.fzzy.api.view.repository.Api1212Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
@@ -30,6 +32,8 @@
     private Api1212Rep api1212Rep;
     @Autowired
     private Api1102Rep api1102Rep;
+    @Autowired
+    private Api1101Rep api1101Rep;
     @Autowired
     private ApiLogRep apiLogRep;
 
@@ -62,7 +66,8 @@
             }
 
             //鏍规嵁搴撳尯浠g爜鑾峰彇鍗曚綅浠g爜
-            Api1102 api1201 = api1102Rep.findById(kqdm).get();
+            Api1102 api1102 = api1102Rep.findById(kqdm).get();
+            Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
 
             Api1212 apiData;
             List<Api1212> api1212List;
@@ -71,25 +76,30 @@
                 apiData = new Api1212();
                 //鍗曚綅浠g爜
                 apiData.setId(sysData.getId());
-                apiData.setDwdm(api1201.getDwdm());
-                apiData.setKqdm(kqdm);
+                apiData.setDwdm(api1101.getDwdm());
+                apiData.setDwmc(api1101.getDwmc());
+                apiData.setKqdm(api1102.getKqdm());
+                apiData.setKqmc(api1102.getKqmc());
                 apiData.setKhlx(sysData.getKhlx());
                 apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
                 apiData.setKhmc(sysData.getName());
                 apiData.setFddbr(sysData.getFddbr());
                 apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress());
-                apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "" :sysData.getYzbm());
+
                 apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser());
                 apiData.setLxrdh(StringUtils.isEmpty(sysData.getPhone()) ? "" :sysData.getPhone());
-                apiData.setLxrsfzh(StringUtils.isEmpty(sysData.getCardId()) ? "100000000000000000" :sysData.getCardId());
+                if(StringUtils.isNotEmpty(sysData.getCardId())){
+                    apiData.setLxrsfzh(sysData.getCardId());
+                }
+                apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "000000" :sysData.getYzbm());
                 apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx());
-//                apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "" :sysData.getBank());
+                apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" :sysData.getBank());
                 apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());
                 apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
                 apiData.setBizId(sysData.getId());
 
 
-                api1212List = api1212Rep.getDataById(sysData.getKhbh());
+                api1212List = api1212Rep.getDataById(sysData.getId());
                 if(null == api1212List || api1212List.isEmpty()){
                     apiData.setCzbz(Constant.CZBZ_I);
                 }else {

--
Gitblit v1.9.3