From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 13c1b8f..a58a370 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -11,6 +11,7 @@
import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -87,15 +88,23 @@
apiData.setYwrq(sysData.getSubmitTime());
//鍑�閲嶆崯婧㈡暟閲忥紝鎹熻�椾负姝ｏ紝婧㈠嚭涓鸿礋
- if (LOSS_OVER_LOSS.equals(sysData.getType())) {
+ if (LOSS_OVER_LOSS.equals(sysData.getType()) || "1".equals(sysData.getType()) || "2".equals(sysData.getType())) {
apiData.setJzsysl(sysData.getAmount());
} else {
apiData.setJzsysl(0 - sysData.getAmount());
}
+ if (LOSS_OVER_LOSS.equals(sysData.getType())) {
+ sysData.setType("1");
+ }
+ if (LOSS_OVER_OVER.equals(sysData.getType())) {
+ sysData.setType("3");
+ }
+ apiData.setSylx(sysData.getType());
apiData.setRkjz(sysData.getRkjz());
apiData.setCkjz(sysData.getCkjz());
- apiData.setRksj(sysData.getSubmitTime());
- apiData.setCksj(sysData.getSubmitTime());
+ apiData.setRksj(sysData.getRksj());
+ apiData.setCksj(sysData.getCksj());
+ apiData.setCcsc(sysData.getCcsc());
apiData.setRksf(sysData.getRksf());
apiData.setRkzz(sysData.getRkzz());
@@ -105,14 +114,15 @@
apiData.setQzszkl(0);
apiData.setQzzrshde(0);
apiData.setChsl(0);
- apiData.setSysfzc(null == sysData.getSysfzc() || sysData.getSysfzc() == "" ? "0" : sysData.getSysfzc());
+ apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+ apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
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