From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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..4a0179d 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());
@@ -150,7 +150,7 @@
apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
apiData.setWcrq(sysData.getEndTime());
- apiData.setLxrxm(sysData.getFddbr());
+ apiData.setLxrxm(StringUtils.isEmpty(sysData.getLxrxm()) ? apiData.getFddbr() : sysData.getLxrxm());
apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�" : sysData.getJsyhtbyzyy());
apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "绛捐鍦扮偣" : sysData.getSignAddress());
apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "閫氳鍦板潃" : sysData.getTxdz());
--
Gitblit v1.9.3