From 3473ebe6988483ba15f4061fddd55624bd22a305 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 05 十二月 2023 10:58:13 +0800
Subject: [PATCH] 更新同步计划时，不区分类型，统一更新为轮换计划
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 55 ++++++++++++++++++-------------------------------------
1 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
index 223a9ea..aa68e8e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -2,20 +2,16 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1206;
import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.service.ApiCommonService;
-import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1206Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -35,15 +31,9 @@
private final static String INOUT_TYPE_OUT = "OUT";
@Autowired
- private Fzzy40Sync1202Rep fzzySync1202Rep;
- @Autowired
private Fzzy40Sync1204Rep fzzySync1204Rep;
@Autowired
- private ApiTriggerService apiTriggerService;
- @Autowired
private Api1206Rep api1206Rep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private Api1102Rep api1102Rep;
@Autowired
@@ -69,7 +59,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
- List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_OUT, start, end);
+ List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(deptId, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
@@ -77,36 +67,20 @@
}
//鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯淇℃伅
- Api1102 api1201 = api1102Rep.findById(kqdm).get();
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
Api1206 apiData;
- Api1105 api1105;
- List<Fz40InoutRecord> fz40InoutRecords;
- Fz40InoutRecord fz40InoutRecord;
+ List<Api1206> api1206List;
for (Fz40InoutSettle sysData : list) {
- //鑾峰彇绮鍑哄簱淇℃伅
- fz40InoutRecords = fzzySync1202Rep.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 Api1206();
- //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
- apiData.setCkjsdh(kqdm + sysData.getId().substring(2));
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyyyMMdd + 4涓洪『搴忓彿
+ apiData.setCkjsdh(kqdm + sysData.getId());
//鍚堝悓鍙�
- apiData.setHth(api1201.getDwdm() + sysData.getId());
+ if(StringUtils.isNotEmpty(sysData.getContractId())){
+ apiData.setHth(api1102.getDwdm() + sysData.getContractId());
+ }
//缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
apiData.setJssl(sysData.getSettleWeight());
@@ -120,18 +94,25 @@
apiData.setKhhh(sysData.getBankCode());
apiData.setKhhmc(sysData.getBank());
apiData.setYhzh(sysData.getBankNum());
+ apiData.setFkr(StringUtils.isEmpty(sysData.getPayUser())? "浠樻浜�":sysData.getPayUser());
apiData.setFphm("");
apiData.setFpzt("");
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
- apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
log.info("1206---鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ api1206List = api1206Rep.getDataById(apiData.getCkjsdh());
+ if (null == api1206List || api1206List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1206List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1206Rep.save(apiData);
}
--
Gitblit v1.9.3