修改字段
This commit is contained in:
wuweihua
@@ -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;
|
||||
}
|
||||
|
||||
+2
-2
@@ -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"));
|
||||
|
||||
@@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="effectiveDate" column="effective_date" />
|
||||
<result property="expireDate" column="expire_date" />
|
||||
<result property="status" column="status" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="updatedAt" column="update_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="effectStatus" column="status" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="currency" column="currency" />
|
||||
<result property="roundMode" column="round_mode" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
</resultMap>
|
||||
|
||||
<select id="selectByBillId" parameterType="String" resultMap="PrcBillFeeResult">
|
||||
|
||||
@@ -20,8 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="discountValue" column="discount_value" />
|
||||
<result property="roundMode" column="round_mode" />
|
||||
<result property="prId" column="pr_id" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="updatedAt" column="update_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPrcPriceSetDetailVo">
|
||||
|
||||
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="currency" column="currency" />
|
||||
<result property="roundMode" column="round_mode" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
</resultMap>
|
||||
|
||||
<select id="selectByQuoteId" parameterType="String" resultMap="PrcQuoteFeeResult">
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="fvUnitweight" column="fv_unitweight" />
|
||||
<result property="effectiveDate" column="effective_date" />
|
||||
<result property="expireDate" column="expire_date" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="updatedAt" column="update_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPrcWeightSectionDetailVo">
|
||||
|
||||
@@ -9,8 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="zdId" column="zd_id" />
|
||||
<result property="countryCode" column="country_code" />
|
||||
<result property="zcDividekind" column="zc_dividekind" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="updatedAt" column="update_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectXtdZoneCountryVo">
|
||||
|
||||
@@ -12,8 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="znName" column="zn_name" />
|
||||
<result property="znEname" column="zn_ename" />
|
||||
<result property="znNote" column="zn_note" />
|
||||
<result property="createdAt" column="create_time" />
|
||||
<result property="updatedAt" column="update_time" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="countryCount" column="country_count" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<el-tag size="small" :type="statusTag(detail.status)">{{ statusLabel(detail.status) }}</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="业务ID">{{ detail.bizId || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="写入时间">{{ detail.updatedAt || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="写入时间">{{ detail.updateTime || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item v-if="detail.errorMessage" label="错误信息" :span="2">
|
||||
<span class="err-text">{{ detail.errorMessage }}</span>
|
||||
</el-descriptions-item>
|
||||
@@ -84,7 +84,7 @@ const columns = [
|
||||
{ label: '类型', prop: 'logType', align: 'center', width: 110, slot: 'logType' },
|
||||
{ label: '状态', prop: 'status', align: 'center', width: 100, slot: 'status' },
|
||||
{ label: '业务ID', prop: 'bizId', minWidth: 180, showOverflowTooltip: true },
|
||||
{ label: '写入时间', prop: 'updatedAt', align: 'center', width: 180 },
|
||||
{ label: '写入时间', prop: 'updateTime', align: 'center', width: 180 },
|
||||
{ label: '操作', prop: 'action', align: 'center', width: 90, fixed: 'right', slot: 'action', showInToolbar: false }
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user