From 4be521d7e3135ac0a8e4a15e395f44448e23e09e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 22 八月 2023 18:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 4df4f97..bfafbc4 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -71,6 +71,7 @@
Api1208 apiData;
Api1105 api1105;
+ List<Api1208> api1208List;
for (Fz35DepotStore fz35DepotStore : list) {
//鑾峰彇璐т綅淇℃伅
@@ -80,6 +81,7 @@
}
apiData = new Api1208();
+ apiData.setId(fz35DepotStore.getId());
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
@@ -135,7 +137,7 @@
apiData.setSjzlxg(6);
apiData.setLdtj(10000);
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(fz35DepotStore.getUpdateDate());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(fz35DepotStore.getId());
@@ -143,8 +145,13 @@
apiData.setSyncTime(new Date());
//搴撳瓨姣忔鏂板
- apiData.setCzbz(Constant.CZBZ_I);
- apiData.setId(ContextUtil.getCurTimeMillis());
+ api1208List = api1208Rep.getDataById(apiData.getId());
+ if(null == api1208List || api1208List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1208List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1208Rep.save(apiData);
}
--
Gitblit v1.9.3