From 4941a9e02e1a89ae3e584787ac1cbf580825f2f2 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 25 十一月 2024 18:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 a58a370..122b32d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -94,7 +94,7 @@
apiData.setJzsysl(0 - sysData.getAmount());
}
if (LOSS_OVER_LOSS.equals(sysData.getType())) {
- sysData.setType("1");
+ sysData.setType("2");
}
if (LOSS_OVER_OVER.equals(sysData.getType())) {
sysData.setType("3");
@@ -110,12 +110,17 @@
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.setQzszkl(sysData.getQzszkl());
+ apiData.setQzzrshde(sysData.getQzzrshde());
+ apiData.setChsl(sysData.getChsl());
+ apiData.setCqqrbs(sysData.getCqqrbs());
+ apiData.setCqqrsj(sysData.getCqqrsj());
+ apiData.setSyhj("2");
apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
- apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
+ apiData.setSfch(2);
+ if(apiData.getJzsysl() > apiData.getQzszkl()){
+ apiData.setSfch(1);
+ }
apiData.setSyyy(sysData.getSyyy());
apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
--
Gitblit v1.9.3