From 30e29906664f9f92886311804c7838f33b9b4cb2 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 31 十月 2024 18:34:45 +0800
Subject: [PATCH] 广东省新接口上报
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 4
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java | 9 +
src/main/java/com/fzzy/api/entity/Api1202.java | 4
src/main/java/com/fzzy/api/view/repository/Api1310Rep.java | 3
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 20 ++-
src/main/java/com/fzzy/api/entity/Api1205.java | 12 ++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 13 ++
src/main/java/com/fzzy/api/entity/Api1206.java | 45 +++++----
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java | 3
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 14 ++
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java | 6 +
src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java | 3
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java | 71 +++++++++++--
src/main/java/com/fzzy/api/entity/Api1201.java | 18 +++
src/main/java/com/fzzy/api/entity/Api1301.java | 1
src/main/java/com/fzzy/api/entity/Api1209.java | 5
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 14 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 8 +
18 files changed, 194 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1201.java b/src/main/java/com/fzzy/api/entity/Api1201.java
index cbdece2..38ceccc 100644
--- a/src/main/java/com/fzzy/api/entity/Api1201.java
+++ b/src/main/java/com/fzzy/api/entity/Api1201.java
@@ -54,6 +54,10 @@
@Column(name = "ywlx", length = 1)
private String ywlx;
+ @PropertyDef(label = "鍚堝悓绉嶇被")
+ @Column(name = "htzl", length = 1)
+ private String htzl;
+
@PropertyDef(label = "瀹㈡埛绫诲瀷")
@Column(name = "khlx", length = 1)
private String khlx;
@@ -104,6 +108,10 @@
@Column(name = "ydwcsj")
private Date ydwcsj;
+ @PropertyDef(label = "楠屾敹鏂瑰紡")
+ @Column(name = "ysfs", length = 64)
+ private String ysfs;
+
@PropertyDef(label = "绛捐鍦扮偣")
@Column(name = "qddd", length = 512)
private String qddd;
@@ -129,6 +137,16 @@
@Column(name = "htzje", precision = 20, scale = 6)
private BigDecimal htzje;
+ /**
+ * 1锛氬叏棰濆厛娆惧悗璐�
+ * 2锛氭寜鍒版杩涘害閫愭壒鍙戣揣
+ * 3锛氳揣鍒板苟纭鍚庝竴娆℃�т粯娆�
+ * 4锛氭寜鍒拌揣鎵规閫愭壒纭銆侀�愭壒浠樻
+ */
+ @PropertyDef(label = "浠樻鏂瑰紡")
+ @Column(name = "fkfs", length = 1)
+ private String fkfs;
+
@PropertyDef(label = "灞ョ害淇濊瘉閲�")
@Column(name = "lybzj", precision = 20, scale = 6)
private double lybzj;
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index ad0053c..e51a1fd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -61,6 +61,10 @@
@Column(name = "lqgsdwdm", length = 18)
private String lqgsdwdm;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ @Column(name = "lqgsdwtybm", length = 18)
+ private String lqgsdwtybm;
+
@PropertyDef(label = "鎵胯繍浜�")
@Column(name = "cyr", length = 64)
private String cyr;
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index a97399c..fb8eee6 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -207,6 +207,18 @@
@Column(name = "ckjsdh", length = 33)
private String ckjsdh;
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
+ @Column(name = "zjbgdh", length = 14)
+ private String zjbgdh;
+
+ @PropertyDef(label = "鐢熸垚鏂瑰紡")
+ @Column(name = "scfs", length = 1)
+ private String scfs;
+
+ @PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
+ @Column(name = "sdblyy", length = 400)
+ private String sdblyy;
+
@PropertyDef(label = "澶囨敞")
@Column(name = "bz", length = 400)
private String bz;
diff --git a/src/main/java/com/fzzy/api/entity/Api1206.java b/src/main/java/com/fzzy/api/entity/Api1206.java
index e69e220..b8704c4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1206.java
+++ b/src/main/java/com/fzzy/api/entity/Api1206.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -19,16 +20,16 @@
@Table(name = "API_1206")
@EqualsAndHashCode(callSuper = false)
public class Api1206 implements Serializable {
-
- public static String SORT_PROP = "ckjsdh";
+
+ public static String SORT_PROP = "ckjsdh";
/**
- *
- */
- private static final long serialVersionUID = -8778664614878279565L;
+ *
+ */
+ private static final long serialVersionUID = -8778664614878279565L;
- @Id
- @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
+ @Id
+ @PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
@Column(name = "ckjsdh", length = 33)
private String ckjsdh;
@@ -36,56 +37,60 @@
@Column(name = "tydwbm", length = 20)
private String tydwbm;
- @PropertyDef(label = "鍚堝悓鍙�" )
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ @Column(name = "tykqbm", length = 22)
+ private String tykqbm;
+
+ @PropertyDef(label = "鍚堝悓鍙�")
@Column(name = "hth", length = 64)
private String hth;
- @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)" )
+ @PropertyDef(label = "缁撶畻鏁伴噺(鍏枻)")
@Column(name = "jssl", precision = 20, scale = 6)
private double jssl;
- @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)" )
+ @PropertyDef(label = "缁撶畻鍗曚环(鍏�/鍏枻)")
@Column(name = "jsdj", precision = 20, scale = 6)
private double jsdj;
- @PropertyDef(label = "缁撶畻閲戦(鍏�)" )
+ @PropertyDef(label = "缁撶畻閲戦(鍏�)")
@Column(name = "jsje", precision = 20, scale = 6)
private double jsje;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "缁撶畻鏃堕棿" )
+ @PropertyDef(label = "缁撶畻鏃堕棿")
@Column(name = "jssj")
private Date jssj;
- @PropertyDef(label = "缁撶畻鏂瑰紡" )
+ @PropertyDef(label = "缁撶畻鏂瑰紡")
@Column(name = "jsfs", length = 1)
private String jsfs;
- @PropertyDef(label = "浠樻浜�" )
+ @PropertyDef(label = "浠樻浜�")
@Column(name = "fkr", length = 256)
private String fkr;
- @PropertyDef(label = "閾惰琛屽埆浠ｇ爜" )
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
@Column(name = "yhhbdm", length = 3)
private String yhhbdm;
- @PropertyDef(label = "寮�鎴疯鍙�" )
+ @PropertyDef(label = "寮�鎴疯鍙�")
@Column(name = "khhh", length = 32)
private String khhh;
- @PropertyDef(label = "寮�鎴疯鍚嶇О" )
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
@Column(name = "khhmc", length = 128)
private String khhmc;
- @PropertyDef(label = "閾惰璐﹀彿" )
+ @PropertyDef(label = "閾惰璐﹀彿")
@Column(name = "yhzh", length = 32)
private String yhzh;
- @PropertyDef(label = "鍙戠エ鍙风爜" )
+ @PropertyDef(label = "鍙戠エ鍙风爜")
@Column(name = "fphm", length = 10)
private String fphm;
- @PropertyDef(label = "鍙戠エ鐘舵��" )
+ @PropertyDef(label = "鍙戠エ鐘舵��")
@Column(name = "fpzt", length = 1)
private String fpzt;
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 01ed372..23859e4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -12,6 +12,7 @@
import javax.persistence.Table;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -113,8 +114,8 @@
private String sylx;
@PropertyDef(label = "鍌ㄥ鏃堕暱")
- @Column(name = "ccsc", length = 4)
- private String ccsc;
+ @Column(name = "ccsc",precision = 3)
+ private BigDecimal ccsc;
@PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
@Column(name = "sfch", length = 1)
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index e1bbbb8..aa949ef 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -82,7 +82,6 @@
@Column(name = "fxglcs", length = 1000)
private String fxglcs;
- @JSONField(name = "Yhxx")
@PropertyDef(label = "闅愭偅淇℃伅" )
@Column(name = "yhxx", length = 256)
private String yhxx;
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
index 6e72bea..c5eb56c 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1310Rep.java
@@ -29,4 +29,7 @@
@Query("from Api1310 where bizId=:bizId ")
List<Api1310> getDataByBizId(@Param("bizId") String bizId);
+
+ @Query("from Api1310 where hwdm=:hwdm and jylb=:jylb order by zhgxsj")
+ List<Api1310> getDataByHwdm(@Param("hwdm") String hwdm,@Param("jylb") String jylb);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
index 4fff6b5..c07d3d1 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutLossOver.java
@@ -9,6 +9,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -28,7 +29,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鎹熺泭鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+涓氬姟鏃ユ湡(yyyyMMdd)+3浣嶉『搴忓彿缁勬垚")
+ @PropertyDef(label = "鎹熺泭鍗曞彿", description = "涓氬姟鏃ユ湡(yyyyMMdd)+3浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -43,18 +44,43 @@
@PropertyDef(label = "鎵�灞炰粨搴�")
private String depotId;
-
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "绫诲瀷", description = "鎹熻��/婧㈠嚭")
- private String type;
-
@Column(name = "SUBMIT_TIME_")
@PropertyDef(label = "涓氬姟鏃ユ湡", description = "yyyy-MM-dd")
private Date submitTime;
+ @Column(name = "TYPE_", length = 1)
+ @PropertyDef(label = "绫诲瀷", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
+ private String type;
+ /**
+ *
+ */
+ @Column(name = "syhj", length = 1)
+ @PropertyDef(label = "鎹熸孩鐜妭", description = "1锛氭崯鑰楋紝2锛氭崯澶憋紝3锛氬叾浠�")
+ private String syhj;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "QUANTITY_ID1", length = 40)
+ @PropertyDef(label = "鍏ュ簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
+ private String quantity1;
+
@PropertyDef(label = "鍏ュ簱鍑�閲�", description = "鍗曚綅锛欿G")
@Column(name = "rkjz", precision = 20, scale = 6)
- private double rkjz;
+ private Double rkjz;
+
+ @Column(name = "ccsc")
+ @PropertyDef(label = "鍌ㄥ瓨鏃堕暱")
+ private BigDecimal ccsc;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍏ュ簱鏃堕棿")
@@ -63,11 +89,15 @@
@PropertyDef(label = "鍏ュ簱姘村垎(%)")
@Column(name = "rksf", precision = 20, scale = 6)
- private double rksf;
+ private Double rksf;
@PropertyDef(label = "鍏ュ簱鏉傝川(%)")
@Column(name = "rkzz", precision = 20, scale = 6)
- private double rkzz;
+ private Double rkzz;
+
+ @Column(name = "QUANTITY_ID2", length = 40)
+ @PropertyDef(label = "鍑哄簱璐ㄦ", description = "鏁版嵁浠嶮Quantity涓幏鍙栵紝涓婁釜璐ㄦ鎵规")
+ private String quantity2;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鍑哄簱鏃堕棿")
@@ -76,20 +106,35 @@
@PropertyDef(label = "鍑哄簱鍑�閲�", description = "鍗曚綅锛欿G")
@Column(name = "ckjz", precision = 20, scale = 6)
- private double ckjz;
+ private Double ckjz;
@PropertyDef(label = "鍑哄簱姘村垎(%)")
@Column(name = "cksf", precision = 16, scale = 6)
- private double cksf;
+ private Double cksf;
@PropertyDef(label = "鍑哄簱鏉傝川(%)")
@Column(name = "ckzz", precision = 16, scale = 6)
- private double ckzz;
+ private Double ckzz;
+
+ @Column(name = "qzszkl")
+ @PropertyDef(label = "姘存潅鎬诲噺閲�")
+ private Double qzszkl;
+
+ @Column(name = "qzzrshde")
+ @PropertyDef(label = "淇濈鑷劧鎹熻��")
+ private Double qzzrshde;
+
+ @Column(name = "chsl")
+ @PropertyDef(label = "瓒呰�楁暟閲�")
+ private Double chsl;
@Column(name = "AMOUNT_")
- @PropertyDef(label = "閲嶉噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
+ @PropertyDef(label = "鎹熻�楅噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
private Double amount;
+ @Column(name = "LOSS_PER_")
+ @PropertyDef(label = "鎹熻�楃巼")
+ private Double lossPer;
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父", description = "0锛氭甯� 1锛氫笉姝ｅ父")
@Column(name = "sysfzc", length = 1)
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 16e1abd..ca3f1a4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -92,6 +92,7 @@
//涓氬姟绫诲瀷
apiData.setYwlx(sysData.getType());
+ apiData.setHtzl(sysData.getType());
//瀹㈡埛绫诲瀷
apiData.setKhlx(sysData.getCustomerType());
@@ -123,6 +124,11 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
+ //todo 楠屾敹鏂瑰紡鏁版嵁鏉ユ簮
+ apiData.setYsfs("浠ュ叆浠撴暟閲忎负鏍囧噯");
+
+ //todo 浠樻鏂瑰紡
+
//鍗曚环锛氬厓/鍚�
apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
@@ -153,7 +159,7 @@
apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
apiData.setSswcsj(sysData.getRelEndTime());
apiData.setYdwcsj(sysData.getEndTime());
- apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser())?"鏈柟绛剧害浜�":sysData.getSignUser());
+ apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
apiData.setSyncTime(new Date());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 58f2391..ff4b9d5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -48,6 +48,8 @@
@Autowired
private Api1204Rep api1204Rep;
@Autowired
+ private Api1208Rep api1208Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -144,6 +146,10 @@
}
}
+ //绮潈鍗曚綅褰掑睘浠ｇ爜
+ List<Api1208> dataByHwdm = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ apiData.setLqgsdwdm(StringUtils.isEmpty(dataByHwdm.get(0).getLqgsdwdm()) ? apiData.getHwdm().substring(0, 18) : dataByHwdm.get(0).getLqgsdwdm());
+
apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃" : sysData.getUserAddress());
//杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
@@ -207,17 +213,17 @@
apiData.setBzbjs(sysData.getBzbjs());
apiData.setCmsj(sysData.getCompleteTime());
//缁撶畻鍗曞彿
- if(StringUtils.isNotEmpty(sysData.getSettleId())){
+ if (StringUtils.isNotEmpty(sysData.getSettleId())) {
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
- if(StringUtils.isNotEmpty(apiData.getHth())){
+ if (StringUtils.isNotEmpty(apiData.getHth())) {
api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
- if(null == api1204List || api1204List.isEmpty()){
+ if (null == api1204List || api1204List.isEmpty()) {
api1204List = api1204Rep.getDataByHth(apiData.getHth());
- if(null != api1204List && api1204List.size() > 0){
+ if (null != api1204List && api1204List.size() > 0) {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
- }else {
+ } else {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
}
@@ -242,8 +248,8 @@
apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks());
apiData.setKlyy("鎵ｉ噺鍘熷洜");
- apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
- apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser()) ? "鐧昏浜�" : sysData.getRegisterUser());
//01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱
//04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
apiData.setCchlx("01");
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 0c5814c..eb98ad2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -47,6 +47,8 @@
@Autowired
private Api1206Rep api1206Rep;
@Autowired
+ private Api1310Rep api1310Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -157,6 +159,17 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
apiData.setLsdjdm(mappingCode);
+ //璐ㄦ鎶ュ憡鍗曞彿
+ List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
+ apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());
+
+ //鐢熸垚鏂瑰紡
+ apiData.setScfs(sysData.getRecordStatus().equals("ADD") ? "2" : "1");
+
+ //鎵嬪姩琛ュ綍鍘熷洜
+ apiData.setSdblyy("搴撳尯鍋滅數锛屾棤娉曚笂浼�");
+
+
//绮鎬ц川
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
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 2462093..0607edb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -62,11 +62,11 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- //鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
+ //鑾峰彇绮鍑哄簱缁撶畻淇℃伅
List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(deptId, INOUT_TYPE_OUT, start, end);
if (null == list || list.isEmpty()) {
- log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
+ log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷嚭搴撶粨绠椾俊鎭�------------------");
return;
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index c548f80..a58a370 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -104,6 +104,7 @@
apiData.setCkjz(sysData.getCkjz());
apiData.setRksj(sysData.getRksj());
apiData.setCksj(sysData.getCksj());
+ apiData.setCcsc(sysData.getCcsc());
apiData.setRksf(sysData.getRksf());
apiData.setRkzz(sysData.getRkzz());
@@ -114,13 +115,14 @@
apiData.setQzzrshde(0);
apiData.setChsl(0);
apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
+ apiData.setSfch("0".equals(apiData.getSysfzc()) ? "2" : "1");
apiData.setSyyy(sysData.getSyyy());
- apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr())?"瀹℃牳浜�":sysData.getCcshr());
- apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr())?"瀹℃牳浜�":sysData.getZjshr());
- apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr())?"瀹℃牳浜�":sysData.getTjshr());
- apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr())?"瀹℃牳浜�":sysData.getKjshr());
- apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr())?"瀹℃牳浜�":sysData.getLdshr());
- apiData.setBz(StringUtils.isEmpty(sysData.getRemark())?"澶囨敞淇℃伅":sysData.getRemark());
+ apiData.setCcshr(StringUtils.isEmpty(sysData.getCcshr()) ? "瀹℃牳浜�" : sysData.getCcshr());
+ apiData.setZjshr(StringUtils.isEmpty(sysData.getZjshr()) ? "瀹℃牳浜�" : sysData.getZjshr());
+ apiData.setTjshr(StringUtils.isEmpty(sysData.getTjshr()) ? "瀹℃牳浜�" : sysData.getTjshr());
+ apiData.setKjshr(StringUtils.isEmpty(sysData.getKjshr()) ? "瀹℃牳浜�" : sysData.getKjshr());
+ apiData.setLdshr(StringUtils.isEmpty(sysData.getLdshr()) ? "瀹℃牳浜�" : sysData.getLdshr());
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemark()) ? "澶囨敞淇℃伅" : sysData.getRemark());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index 005b0fd..bf9945d 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -559,6 +559,10 @@
String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
apiData.setTydwbm(tydwbm);
}
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -695,7 +699,7 @@
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
if ("0".equals(apiData.getTyajbm()) || StringUtils.isEmpty(apiData.getTyajbm())) {
- String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 26));
+ String tyajbm = apiCommonService.getTyajbm(apiData.getHwdm().substring(0, 28));
apiData.setTyajbm(tyajbm);
}
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
@@ -807,6 +811,10 @@
String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
apiData.setWgdwtybm(tydwbm);
}
+ if ("0".equals(apiData.getTykqbm()) || StringUtils.isEmpty(apiData.getTykqbm())) {
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ apiData.setTykqbm(tykqbm);
+ }
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
@@ -895,7 +903,7 @@
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (com.fzzy.push.gd2023.ApiCodeConstant.API_2001.equals(inteId)) {
+ if (ApiCodeConstant.API_2001.equals(inteId)) {
Gd2023Api2001 apiData = new Gd2023Api2001();
BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
@@ -911,7 +919,7 @@
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
- if (com.fzzy.push.gd2023.ApiCodeConstant.API_2002.equals(inteId)) {
+ if (ApiCodeConstant.API_2002.equals(inteId)) {
Gd2023Api2002 apiData = new Gd2023Api2002();
BeanUtils.copyProperties(data, apiData);
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java
index b63cad5..a37af83 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1201.java
@@ -22,9 +22,9 @@
@EqualsAndHashCode(callSuper = false)
public class Gd2023Api1201 extends ApiParent implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = -5548540780391804729L;
+ *
+ */
+ private static final long serialVersionUID = -5548540780391804729L;
@PropertyDef(label = "鍚堝悓鍙�")
@@ -131,6 +131,9 @@
@PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��")
private String jsyhtyzx;
+ @PropertyDef(label = "绛捐鍦扮偣")
+ private String qddd;
+
@PropertyDef(label = "缁撶畻涓庡悎鍚屼笉涓�鑷村師鍥�")
private String jsyhtbyzyy;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java
index de219cd..b92890c 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1206.java
@@ -26,6 +26,9 @@
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
private String tydwbm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍚堝悓鍙�" )
private String hth;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
index 4b87d2d..5b34020 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1209.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -72,7 +73,7 @@
private Double ckzz;
@PropertyDef(label = "鍌ㄥ瓨鏃堕暱" )
- private String ccsc;
+ private BigDecimal ccsc;
@PropertyDef(label = "瀹為檯鎹熺泭鏁伴噺" )
private Double jzsysl;
diff --git a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java
index 10f5da1..825c237 100644
--- a/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java
+++ b/src/main/java/com/fzzy/push/gd2023/dto/Gd2023Api1309.java
@@ -39,6 +39,9 @@
@PropertyDef(label = "杩濊鍗曚綅缁熶竴缂栫爜")
private String wgdwtybm;
+ @PropertyDef(label = "搴撳尯缁熶竴缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "杩濊琛屼负浜�" )
private String wgxwr;
@@ -71,4 +74,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
private Date zhgxsj;
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
}
--
Gitblit v1.9.3