From ee96821fc7990857ad6477690a5758f8c0ebaa66 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index c2c44b7..2476043 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -144,9 +144,16 @@
if (sysData.getCheckTime() != null) {
String isCheckTime = DateFormatUtils.format(sysData.getCheckTime(), "yyMMdd");
if (!isCheckTime.equals(time)) {
- apiData.setRkjydh("14" + isCheckTime + "1" + api1102List.get(0).getRkywdh().substring(9));
+ int difDay = DateUtil.difDay1(sysData.getRegisterTime(), sysData.getCheckTime());
+ apiData.setRkjydh("14" + isCheckTime + String.format("%02d", difDay) + api1102List.get(0).getRkywdh().substring(10));
}
}
+
+ //鑸硅繍浣跨敤鍏ュ簱鍗曟嵁鍙峰仛璐ㄦ鍗曞彿
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
+ }
+
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -203,9 +210,6 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
- if (StringUtils.isEmpty(mappingCode)) {
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
- }
apiData.setLspzdm(mappingCode);
//淇濈鍛樺鏍�
@@ -241,4 +245,18 @@
apiLogRep.save(apiLog);
}
}
+
+ public static void main(String[] args) {
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ String id = "142508200001";
+ String time = id.substring(2, 8);
+
+ String isCheckTime = "250821";
+ if (!isCheckTime.equals(time)) {
+ int difDay = 2;
+ String idd = "14" + isCheckTime + difDay + id.substring(9);
+ System.out.println(idd);
+ }
+
+ }
}
--
Gitblit v1.9.3