From 3f0b65b6b8af5c8c0aa2efa57be3adf2398cd62c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 21:10:30 +0800
Subject: [PATCH] 四川网关-提交测试
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 710a7ef..895590f 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -99,7 +99,7 @@
//鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date time = dateFormat.parse(sysData.getId().substring(2, 10));
- int numDay = DateUtil.difDay(sysData.getCompleteTime(), time);
+ int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
if(numDay != 0){
sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
@@ -135,7 +135,7 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -153,7 +153,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
+ if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -164,7 +164,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
+ if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -184,7 +184,7 @@
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- if(sysData.getCompleteTime().before(sysData.getEmptyWeightTime())){
+ if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
--
Gitblit v1.9.3