From 3b4b16061d0373e3eb5c6473586c6c6edd9393de Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 14 八月 2023 17:04:11 +0800
Subject: [PATCH] 优化4.0版本-出入库及合同同步

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
index b70c500..0f5faab 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -9,17 +9,15 @@
 import com.fzzy.api.view.repository.Api1102Rep;
 import com.fzzy.api.view.repository.Api1201Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.MContract;
+import com.fzzy.async.fzzy35.entity.Fz35MContract;
 import com.fzzy.async.fzzy35.repository.Fzzy35Sync1201Rep;
 import lombok.extern.slf4j.Slf4j;
 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;
-
 
 /**
  * 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
@@ -60,7 +58,7 @@
         apiLog.setStatus(99);
         apiLog.setId(ContextUtil.getUUID());
         try {
-            List<MContract> list = fzzySync1201Rep.listContract(deptId, start, end);
+            List<Fz35MContract> list = fzzySync1201Rep.listContract(deptId, start, end);
 
             if (null == list || list.isEmpty()) {
                 log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------");
@@ -71,14 +69,14 @@
             Api1102 api1201 = api1102Rep.findById(kqdm).get();
 
             Api1201 apiData;
-            for (MContract sysData : list) {
+            List<Api1201> api1201List;
+            for (Fz35MContract sysData : list) {
 
                 apiData = new Api1201();
                 //鍗曚綅浠g爜锛� 1101 鎺ュ彛鐨勫崟浣嶄唬 鐮侊級 +鑷畾涔夌紪鐮�
                 apiData.setHth(api1201.getDwdm() + sysData.getId());
                 apiData.setHtmc(sysData.getName());
                 apiData.setDwdm(api1201.getDwdm());
-
 
                 //涓氬姟绫诲瀷
                 String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
@@ -100,8 +98,8 @@
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodVariety());
                 apiData.setLsxzdm(mappingCode);
 
-                //鍗曚环锛氬厓/鍏枻-->鍏�/鍚�
-                apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice()*1000);
+                //鍗曚环锛氬厓/鍚�
+                apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
                 apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
 
                 apiData.setHtzje(new BigDecimal(sysData.getMoney()));
@@ -119,18 +117,22 @@
                 mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
                 apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);
 
-                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
+                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
 
                 apiData.setWcrq(sysData.getEndTime());
 
-                apiData.setCzbz(Constant.CZBZ_I);
                 apiData.setZhgxsj(sysData.getCreateTime());
 
                 apiData.setSyncTime(new Date());
                 apiData.setBizId(sysData.getId());
+                apiData.setKqdm(kqdm);
 
-                apiLog.setDataId(apiData.getBizId());
-                apiLog.setKqdm(kqdm);
+                api1201List = api1201Rep.getDataById(apiData.getHth());
+                if(null == api1201List || api1201List.isEmpty()){
+                    apiData.setCzbz(Constant.CZBZ_I);
+                }else {
+                    apiData.setCzbz(api1201List.get(0).getCzbz());
+                }
 
                 //淇濆瓨鏁版嵁
                 api1201Rep.save(apiData);

--
Gitblit v1.9.3