From f43613cc5aba07a9cb0482b7171ae6569c901e50 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:01 +0800
Subject: [PATCH] 61版本同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index 4dc3bf6..d3d4317 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -11,10 +11,13 @@
 import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
 import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 
@@ -86,37 +89,44 @@
                 apiData.setSydh(api1105.getHwdm() + sysData.getId());
                 apiData.setHwdm(api1105.getHwdm());
                 apiData.setYwrq(sysData.getSubmitTime());
-
+                apiData.setSylx(sysData.getType());
                 //鍑�閲嶆崯婧㈡暟閲忥紝鎹熻�椾负姝o紝婧㈠嚭涓鸿礋
+                apiData.setJzsysl(sysData.getAmount());
                 if (LOSS_OVER_LOSS.equals(sysData.getType())) {
-                    apiData.setJzsysl(sysData.getAmount());
-                    apiData.setCkjz(sysData.getAmount());
-                    apiData.setRkjz(0);
-                } else {
-                    apiData.setJzsysl(0 - sysData.getAmount());
-                    apiData.setRkjz(sysData.getAmount());
-                    apiData.setCkjz(0);
+                    sysData.setType("2");
                 }
-
-                apiData.setRksj(sysData.getSubmitTime());
-                apiData.setCksj(sysData.getSubmitTime());
+                if (LOSS_OVER_OVER.equals(sysData.getType())) {
+                    sysData.setType("3");
+                    apiData.setJzsysl(0 - sysData.getAmount());
+                }
+                apiData.setRkjz(sysData.getRkjz());
+                apiData.setCkjz(sysData.getCkjz());
+                apiData.setRksj(sysData.getRksj());
+                apiData.setCksj(sysData.getCksj());
+                apiData.setCcsc(sysData.getCcsc());
 
                 apiData.setRksf(sysData.getRksf());
                 apiData.setRkzz(sysData.getRkzz());
                 apiData.setCksf(sysData.getCksf());
                 apiData.setCkzz(sysData.getCkzz());
-                apiData.setQzchwqsh(0);
-                apiData.setQzszkl(0);
-                apiData.setQzzrshde(0);
-                apiData.setChsl(0);
-                apiData.setSysfzc(null == sysData.getSysfzc() || sysData.getSysfzc() == "" ? "0" : sysData.getSysfzc());
+                apiData.setQzszkl(sysData.getQzszkl());
+
+                BigDecimal bigDecimal = BigDecimal.valueOf(sysData.getQzzrshde());
+                apiData.setQzzrshde(bigDecimal.setScale(3, RoundingMode.UP).doubleValue());
+
+                apiData.setChsl(sysData.getChsl());
+                apiData.setCqqrbs(1);
+                apiData.setCqqrsj(sysData.getCqqrsj() == null ? DateUtils.addSeconds(sysData.getCksj(), 120) : sysData.getCqqrsj());
+                apiData.setSyhj("2");
+                apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+                apiData.setSfch(sysData.getSfch());
                 apiData.setSyyy(sysData.getSyyy());
-                apiData.setCcshr(sysData.getCcshr());
-                apiData.setZjshr(sysData.getZjshr());
-                apiData.setTjshr(sysData.getTjshr());
-                apiData.setKjshr(sysData.getKjshr());
-                apiData.setLdshr(sysData.getLdshr());
-                apiData.setBz(sysData.getRemark());
+                apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
+                apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
+                apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃牳浜�" : sysData.getTjshr());
+                apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃牳浜�" : sysData.getKjshr());
+                apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃牳浜�" : sysData.getLdshr());
+                apiData.setBz(StringUtils.isEmpty(sysData.getRemark()) ? "澶囨敞淇℃伅" : sysData.getRemark());
 
 
                 //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�

--
Gitblit v1.9.3