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/Fzzy40Sync1201.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 16e1abd..067c6f9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -92,6 +92,7 @@
//涓氬姟绫诲瀷
apiData.setYwlx(sysData.getType());
+ apiData.setHtzl(sysData.getType());
//瀹㈡埛绫诲瀷
apiData.setKhlx(sysData.getCustomerType());
@@ -123,6 +124,11 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
+
+ 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());
@@ -153,7 +159,7 @@
apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
apiData.setSswcsj(sysData.getRelEndTime());
apiData.setYdwcsj(sysData.getEndTime());
- apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser())?"鏈柟绛剧害浜�":sysData.getSignUser());
+ apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
apiData.setSyncTime(new Date());
--
Gitblit v1.9.3