修改字段

This commit is contained in:
wuweihua
2026-09-14 09:32:07 +08:00
parent 78ee8ee2da
commit 4cc20386d9
17 changed files with 40 additions and 33 deletions
@@ -33,9 +33,9 @@ public class BmsProductCountry implements Serializable
/** 0 pending, 1 active, 2 expired */
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
private Date updateTime;
/** query only: true = expire_date is null */
private Boolean openOnly;
/** query alias of status (0/1/2) */
@@ -22,5 +22,5 @@ public class PrcBillFee implements Serializable
private String roundMode;
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
}
@@ -30,7 +30,7 @@ public class PrcPriceSetDetail implements Serializable
private String roundMode;
private Integer prId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
private Date updateTime;
}
@@ -24,5 +24,5 @@ public class PrcQuoteFee implements Serializable
private String roundMode;
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
}
@@ -24,7 +24,7 @@ public class PrcWeightSectionDetail implements Serializable
@JsonFormat(pattern = "yyyy-MM-dd")
private Date expireDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
private Date updateTime;
}
@@ -16,7 +16,7 @@ public class XtdZoneCountry implements Serializable
private String countryCode;
private String zcDividekind;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
private Date updateTime;
}
@@ -19,9 +19,9 @@ public class XtdZoneDivision implements Serializable
private String znEname;
private String znNote;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
private Date updateTime;
/** 列表展示,非表字段 */
private Integer countryCount;
}
@@ -10,7 +10,7 @@ public class BillSyncSnapshot
private String responseJson;
private String status;
private String errorMessage;
private String updatedAt;
private String updateTime;
public String getDocId()
{
@@ -82,13 +82,13 @@ public class BillSyncSnapshot
this.errorMessage = errorMessage;
}
public String getUpdatedAt()
public String getUpdateTime()
{
return updatedAt;
return updateTime;
}
public void setUpdatedAt(String updatedAt)
public void setUpdateTime(String updateTime)
{
this.updatedAt = updatedAt;
this.updateTime = updateTime;
}
}
@@ -67,7 +67,9 @@ public class EsBillSearchStore implements IBillSearchStore
doc.put("error", StringUtils.isEmpty(errorMessage) ? null : errorMessage);
doc.put("request", parseOrRaw(requestJson));
doc.put("response", parseOrRaw(responseJson));
doc.put("updatedAt", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now));
String ts = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now);
doc.put("updatedAt", ts);
doc.put("updateTime", ts);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<String> entity = new HttpEntity<String>(doc.toJSONString(), headers);
@@ -218,7 +220,12 @@ public class EsBillSearchStore implements IBillSearchStore
}
snap.setRequestJson(toJsonString(source.get("request")));
snap.setResponseJson(toJsonString(source.get("response")));
snap.setUpdatedAt(source.getString("updatedAt"));
String time = source.getString("updateTime");
if (StringUtils.isEmpty(time))
{
time = source.getString("updatedAt");
}
snap.setUpdateTime(time);
String status = source.getString("status");
snap.setStatus(StringUtils.isEmpty(status) ? EsBizLogSupport.STATUS_SUCCESS : status);
snap.setErrorMessage(source.getString("error"));