From da0dfffe0c57ed3ca0c66b24a68ccc64da0873c9 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 19 十月 2023 20:19:51 +0800
Subject: [PATCH] 调整上海接口-船运时调整每车为一条数据
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index 0ef1b56..7e08640 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -10,11 +10,14 @@
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutContract;
+import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1201Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1212Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -26,6 +29,8 @@
@Component
public class Fzzy40Sync1201 {
+ @Autowired
+ private Fzzy40Sync1212Rep fzzySync1212Rep;
@Autowired
private Fzzy40Sync1201Rep fzzySync1201Rep;
@Autowired
@@ -70,42 +75,51 @@
Api1201 apiData;
List<Api1201> api1201List;
+ List<Fz40InoutCustomer> listCustomer;
for (Fz40InoutContract sysData : list) {
apiData = new Api1201();
//鍗曚綅浠ｇ爜锛� 1101 鎺ュ彛鐨勫崟浣嶄唬 鐮侊級 +鑷畾涔夌紪鐮�
apiData.setHth(api1201.getDwdm() + sysData.getId());
- apiData.setHtmc(sysData.getName());
+ apiData.setHtmc(sysData.getName().trim());
apiData.setDwdm(api1201.getDwdm());
//涓氬姟绫诲瀷
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
- apiData.setYwlx(mappingCode);
+ apiData.setYwlx(sysData.getType());
//瀹㈡埛绫诲瀷
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_KHLX, sysData.getCustomerType());
- apiData.setKhlx(mappingCode);
+ apiData.setKhlx(sysData.getCustomerType());
- apiData.setKhtyshxydm(StringUtils.isEmpty(sysData.getCustomerId()) ? "100000000000000000" :sysData.getCustomerId());
+ //浼佷笟瀹㈡埛锛岄渶瑕佽缃俊鐢ㄧ爜
+ if ("1".equals(sysData.getCustomerType())) {
+ listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
+ if (null == listCustomer || listCustomer.isEmpty()) {
+ continue;
+ }
+ apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+ }
+
apiData.setKhmc(sysData.getCustomerName());
- apiData.setFddbr(sysData.getCustomerSignUser());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());
apiData.setQdrq(sysData.getSigningTime());
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ if(StringUtils.isEmpty(sysData.getFoodVariety())){
+ continue;
+ }
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
apiData.setLspzdm(mappingCode);
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodVariety());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
- //鍗曚环锛氬厓/鍏枻-->鍏�/鍚�
- apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice()*1000);
+ //鍗曚环锛氬厓/鍚�
+ apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
apiData.setHtzje(new BigDecimal(sysData.getMoney()));
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_JSYHTYZX, "");
- apiData.setJsyhtyzx(mappingCode);
+ apiData.setJsyhtyzx(StringUtils.isEmpty(sysData.getJsyhtyzx()) ? "1" : sysData.getJsyhtyzx());
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
apiData.setKhfkhh(mappingCode);
@@ -117,7 +131,7 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);
- apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
+ apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
apiData.setWcrq(sysData.getEndTime());
@@ -125,14 +139,12 @@
apiData.setSyncTime(new Date());
apiData.setBizId(sysData.getId());
-
- apiLog.setDataId(apiData.getBizId());
- apiLog.setKqdm(kqdm);
+ apiData.setKqdm(kqdm);
api1201List = api1201Rep.getDataById(apiData.getHth());
- if(null == api1201List || api1201List.isEmpty()){
+ if (null == api1201List || api1201List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1201List.get(0).getCzbz());
}
--
Gitblit v1.9.3