From cd091408dcff794e3001e43b99a6d521cfff36dc Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 13 十一月 2023 21:04:04 +0800
Subject: [PATCH] 优化上海接口批次号问题
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java | 55 +++++++++++++++++--------------------------------------
1 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
index a97d794..a412655 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
@@ -7,18 +7,10 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
-import com.fzzy.async.fzzy30.repository.FzzySync1202Rep;
-import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
-import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
-import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -40,11 +32,7 @@
private final static String INOUT_TYPE_IN = "IN";
@Autowired
- private Fzzy40Sync1202Rep fzzy40Sync1202Rep;
- @Autowired
private Fzzy40Sync1204Rep fzzy40Sync1204Rep;
- @Autowired
- private Fzzy40SyncNoticeInRep fzzySyncNoticeInRep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -74,7 +62,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
- List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(INOUT_TYPE_IN, start, end);
+ List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(deptId, INOUT_TYPE_IN, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
@@ -83,32 +71,18 @@
Api1204 apiData;
Api1105 api1105;
- List<Fz40InoutRecord> fz40InoutRecords;
- Fz40InoutRecord fz40InoutRecord;
+ List<Api1204> api1204List;
for (Fz40InoutSettle sysData : list) {
- //鑾峰彇绮鍏ュ簱淇℃伅
- fz40InoutRecords = fzzy40Sync1202Rep.listInoutRecordById(sysData.getId());
- if (null == fz40InoutRecords || fz40InoutRecords.isEmpty()) {
- continue;
- }
- fz40InoutRecord = fz40InoutRecords.get(0);
- if (!deptId.equals(fz40InoutRecord.getDeptId())) {
- continue;
- }
-
- //鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(fz40InoutRecord.getDepotId());
- if (null == api1105) {
- continue;
- }
-
apiData = new Api1204();
- //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
- apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyyyMMdd + 4涓洪『搴忓彿
+ apiData.setRkjsdh(kqdm + sysData.getId());
- //璐т綅浠ｇ爜
- apiData.setHwdm(api1105.getHwdm());
+ if(StringUtils.isNotEmpty(sysData.getDepotId())){
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
+ }
//缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
apiData.setJssl(sysData.getSettleWeight());
@@ -130,8 +104,7 @@
apiData.setFkdw(sysData.getPayUnit());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
- apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
@@ -139,6 +112,12 @@
apiData.setSyncTime(new Date());
log.info("1204---鍚屾鏁版嵁锛歿}", apiData.toString());
//淇濆瓨鏁版嵁
+ api1204List = api1204Rep.getDataById(apiData.getRkjsdh());
+ if (null == api1204List || api1204List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1204List.get(0).getCzbz());
+ }
api1204Rep.save(apiData);
}
} catch (Exception e) {
--
Gitblit v1.9.3