From b6faf70a938ca9e014d34b235dec449f2a21abb4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 30 六月 2025 17:03:13 +0800
Subject: [PATCH] 数据同步时,品种处理

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

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 7310119..64f6465 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -15,6 +15,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -91,6 +92,7 @@
 
                 //涓氬姟绫诲瀷
                 apiData.setYwlx(sysData.getType());
+                apiData.setHtzl(sysData.getType());
                 //瀹㈡埛绫诲瀷
                 apiData.setKhlx(sysData.getCustomerType());
 
@@ -101,6 +103,10 @@
                         continue;
                     }
                     apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+                    apiData.setSfzh(listCustomer.get(0).getCardId());
+                    apiData.setLxrdh(listCustomer.get(0).getPhone());
+                    apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : listCustomer.get(0).getYzbm());
+                    apiData.setDzyx(listCustomer.get(0).getDzyx());
                 }
 
 
@@ -109,15 +115,24 @@
 
                 apiData.setQdrq(sysData.getSigningTime());
 
-                if(StringUtils.isEmpty(sysData.getFoodVariety())){
+                if (StringUtils.isEmpty(sysData.getFoodVariety())) {
                     continue;
                 }
-                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
+                //绮鍝佺
+                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());
                 apiData.setLsxzdm(mappingCode);
 
+
+                apiData.setYsfs(StringUtils.isEmpty(sysData.getYsfs()) ? "浠ュ叆浠撴暟閲忎负鏍囧噯" : sysData.getYsfs());
+
+
+                apiData.setFkfs(StringUtils.isEmpty(sysData.getFkfs()) ? "1" : sysData.getFkfs());
                 //鍗曚环锛氬厓/鍚�
                 apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
                 apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
@@ -139,8 +154,19 @@
                 apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
 
                 apiData.setWcrq(sysData.getEndTime());
-
+                apiData.setLxrxm(StringUtils.isEmpty(sysData.getLxrxm()) ? apiData.getFddbr() : sysData.getLxrxm());
+                apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�" : sysData.getJsyhtbyzyy());
+                apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "绛捐鍦扮偣" : sysData.getSignAddress());
+                apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "閫氳鍦板潃" : sysData.getTxdz());
                 apiData.setZhgxsj(sysData.getCreateTime());
+                apiData.setShr(StringUtils.isEmpty(sysData.getAuditUser()) ? "瀹℃壒浜�" : sysData.getAuditUser());
+                apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
+                apiData.setSswcsj(sysData.getRelEndTime());
+                apiData.setYdwcsj(sysData.getEndTime());
+                apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
+
+                //璁剧疆骞村害
+                apiData.setLhnd(sysData.getYear());
 
                 apiData.setSyncTime(new Date());
                 apiData.setBizId(sysData.getId());
@@ -158,10 +184,10 @@
                 log.info("1201---鍚堝悓鍚屾鏁版嵁锛歿}", apiData.toString());
 
                 //鑻ラ檮浠秈d涓嶄负绌猴紝鍒欏垽鏂槸鍚︿负涓婃捣鍗忚锛屼笂娴峰崗璁椂锛岄渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
-                if(StringUtils.isNotEmpty(sysData.getFileId())){
+                if (StringUtils.isNotEmpty(sysData.getFileId())) {
                     //鑻ヤ负涓婃捣鐪佸钩鍙板崗璁紝鍒欓渶鍚屾椂鍚屾鍚堝悓闄勪欢淇℃伅
                     List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
-                    if(null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())){
+                    if (null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())) {
                         api1109 = new Api1109();
                         //涓婚敭id
                         api1109.setId(apiData.getHth());
@@ -170,8 +196,8 @@
 
                         String kzm = "pdf"; //鎵╁睍鍚嶏細榛樿涓簆df
                         String[] split = sysData.getFileId().split("\\.");
-                        if(split.length > 0){
-                            kzm = split[split.length -1];
+                        if (split.length > 0) {
+                            kzm = split[split.length - 1];
                         }
 
                         //鏂囦欢鍚嶇О(鍚堝悓鍙�+鎵╁睍鍚�)

--
Gitblit v1.9.3