From 12a52e58d8d0ff76869c760ecd29095ed38484fa Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 18 十一月 2024 09:36:05 +0800
Subject: [PATCH] 同步调整
---
src/main/java/com/fzzy/api/entity/Api1110.java | 4 ++++
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java | 8 ++++++++
src/main/java/com/fzzy/api/entity/Api1209.java | 16 ++++++++--------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 6 +++---
6 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1110.java b/src/main/java/com/fzzy/api/entity/Api1110.java
index 9be660d..ebf39d2 100644
--- a/src/main/java/com/fzzy/api/entity/Api1110.java
+++ b/src/main/java/com/fzzy/api/entity/Api1110.java
@@ -33,6 +33,10 @@
@Column(name = "dwdm", length = 18)
private String dwdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜" )
+ @Column(name = "tykqbm", length = 20)
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜" )
@Column(name = "kqdm", length = 21)
private String kqdm;
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 4425f2a..4319be7 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -86,31 +86,31 @@
private Date cksj;
@PropertyDef(label = "鍑哄簱鍑�閲�(鍏枻)")
- @Column(name = "ckjz", precision = 20, scale = 6)
+ @Column(name = "ckjz", precision = 20, scale = 3)
private double ckjz;
@PropertyDef(label = "鍑哄簱姘村垎(%)")
- @Column(name = "cksf", precision = 20, scale = 6)
+ @Column(name = "cksf", precision = 20, scale = 3)
private double cksf;
@PropertyDef(label = "鍑哄簱鏉傝川(%)")
- @Column(name = "ckzz", precision = 20, scale = 6)
+ @Column(name = "ckzz", precision = 6, scale = 2)
private double ckzz;
@PropertyDef(label = "鍌ㄥ鏃堕暱")
- @Column(name = "ccsc",precision = 3)
+ @Column(name = "ccsc")
private Integer ccsc;
@PropertyDef(label = "瀹為檯鎹熸孩鏁伴噺(鍏枻)")
- @Column(name = "jzsysl", precision = 20, scale = 6)
+ @Column(name = "jzsysl", precision = 20, scale = 3)
private double jzsysl;
@PropertyDef(label = "姘存潅鍑忛噺(鍏枻)")
- @Column(name = "qzszkl", precision = 20, scale = 6)
+ @Column(name = "qzszkl", precision = 20, scale = 3)
private double qzszkl;
@PropertyDef(label = "鑷劧鎹熻�楀畾棰�(鍏枻)")
- @Column(name = "qzzrshde", precision = 20, scale = 6)
+ @Column(name = "qzzrshde", precision = 20, scale = 3)
private double qzzrshde;
@PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
@@ -118,7 +118,7 @@
private Integer sfch;
@PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)")
- @Column(name = "chsl", precision = 20, scale = 6)
+ @Column(name = "chsl", precision = 20, scale = 3)
private double chsl;
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父",description = "0:姝ｅ父锛�1锛氫笉姝ｅ父")
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java
index 3e13ca1..61521b1 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java
@@ -191,6 +191,14 @@
@PropertyDef(label = "鏀粯鏂瑰紡")
private String payType;
+ @Column(name = "fkfs")
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ private String fkfs;
+
+ @Column(name = "ysfs", length = 64)
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ private String ysfs;
+
/**
* --------瀹℃壒淇℃伅--------
**/
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
index 7bf8219..e93e430 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
@@ -49,7 +49,7 @@
private Date submitTime;
@Column(name = "TYPE_", length = 1)
- @PropertyDef(label = "绫诲瀷", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
+ @PropertyDef(label = "绫诲瀷", description = "1锛氭崯澶憋紝2锛氭崯鑰楋紝3锛氬叾浠�")
private String type;
/**
*
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 ca3f1a4..067c6f9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -124,11 +124,11 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
- //todo 楠屾敹鏂瑰紡鏁版嵁鏉ユ簮
- apiData.setYsfs("浠ュ叆浠撴暟閲忎负鏍囧噯");
- //todo 浠樻鏂瑰紡
+ 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());
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 bc3127e..20748ea 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");
--
Gitblit v1.9.3