Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
6656facc 1 parent e5a51705

common-dao、common-dependencies | 修改 | kafka501消息处理 

mt
2024年11月4日18:49:02
Expand all
Inline Side-by-side
Showing 18 changed files with 443 additions and 171 deletions
......@@ -29,7 +29,7 @@
<result column="SHIPPER_ADDR_LINE1" jdbcType="VARCHAR" property="shipperAddrLine1" />
<result column="SHIPPER_ADDR_LINE2" jdbcType="VARCHAR" property="shipperAddrLine2" />
<result column="SHIPPER_CITY" jdbcType="VARCHAR" property="shipperCity" />
<result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
<result column="SHIPPER_POSTAL_CODE" jdbcType="VARCHAR" property="shipperPostalCode" />
<result column="RECIPIENT_CONTACT_NAME" jdbcType="VARCHAR" property="recipientContactName" />
<result column="RECIPIENT_PHONE" jdbcType="VARCHAR" property="recipientPhone" />
<result column="RECIPIENT_COMPANY" jdbcType="VARCHAR" property="recipientCompany" />
......@@ -37,6 +37,8 @@
<result column="RECIPIENT_ADDR_LINE2" jdbcType="VARCHAR" property="recipientAddrLine2" />
<result column="RECIPIENT_ADDR_LINE3" jdbcType="VARCHAR" property="recipientAddrLine3" />
<result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
<result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" />
<result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -101,9 +103,9 @@
CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT,
SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY,
SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_EMAIL, RECIPIENT_CONTACT_NAME,
SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME,
RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3,
RECIPIENT_CITY
RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG
</sql>
<select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultMap="BaseResultMap">
<include refid="OracleDialectPrefix" />
......@@ -151,9 +153,11 @@
WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME,
SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY,
SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY,
SHIPPER_EMAIL, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE,
RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2,
RECIPIENT_ADDR_LINE3, RECIPIENT_CITY)
SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME,
RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1,
RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3,
RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG
)
values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP},
#{shipDate,jdbcType=TIMESTAMP}, #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR},
#{destIataCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
......@@ -163,9 +167,11 @@
#{weightunit,jdbcType=VARCHAR}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR},
#{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR},
#{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR},
#{shipperEmail,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR},
#{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR}, #{recipientAddrLine2,jdbcType=VARCHAR},
#{recipientAddrLine3,jdbcType=VARCHAR}, #{recipientCity,jdbcType=VARCHAR})
#{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR},
#{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR},
#{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR},
#{recipientCity,jdbcType=VARCHAR}, #{recipientPostalCode,jdbcType=VARCHAR}, #{docNondocFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.CeInfo">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
......@@ -252,8 +258,8 @@
<if test="shipperCity != null">
SHIPPER_CITY,
</if>
<if test="shipperEmail != null">
SHIPPER_EMAIL,
<if test="shipperPostalCode != null">
SHIPPER_POSTAL_CODE,
</if>
<if test="recipientContactName != null">
RECIPIENT_CONTACT_NAME,
......@@ -276,6 +282,12 @@
<if test="recipientCity != null">
RECIPIENT_CITY,
</if>
<if test="recipientPostalCode != null">
RECIPIENT_POSTAL_CODE,
</if>
<if test="docNondocFlag != null">
DOC_NONDOC_FLAG,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{id,jdbcType=NUMERIC},
......@@ -357,8 +369,8 @@
<if test="shipperCity != null">
#{shipperCity,jdbcType=VARCHAR},
</if>
<if test="shipperEmail != null">
#{shipperEmail,jdbcType=VARCHAR},
<if test="shipperPostalCode != null">
#{shipperPostalCode,jdbcType=VARCHAR},
</if>
<if test="recipientContactName != null">
#{recipientContactName,jdbcType=VARCHAR},
......@@ -381,6 +393,12 @@
<if test="recipientCity != null">
#{recipientCity,jdbcType=VARCHAR},
</if>
<if test="recipientPostalCode != null">
#{recipientPostalCode,jdbcType=VARCHAR},
</if>
<if test="docNondocFlag != null">
#{docNondocFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long">
......@@ -473,8 +491,8 @@
<if test="record.shipperCity != null">
SHIPPER_CITY = #{record.shipperCity,jdbcType=VARCHAR},
</if>
<if test="record.shipperEmail != null">
SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
<if test="record.shipperPostalCode != null">
SHIPPER_POSTAL_CODE = #{record.shipperPostalCode,jdbcType=VARCHAR},
</if>
<if test="record.recipientContactName != null">
RECIPIENT_CONTACT_NAME = #{record.recipientContactName,jdbcType=VARCHAR},
......@@ -497,6 +515,12 @@
<if test="record.recipientCity != null">
RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
</if>
<if test="record.recipientPostalCode != null">
RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
</if>
<if test="record.docNondocFlag != null">
DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -531,14 +555,16 @@
SHIPPER_ADDR_LINE1 = #{record.shipperAddrLine1,jdbcType=VARCHAR},
SHIPPER_ADDR_LINE2 = #{record.shipperAddrLine2,jdbcType=VARCHAR},
SHIPPER_CITY = #{record.shipperCity,jdbcType=VARCHAR},
SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
SHIPPER_POSTAL_CODE = #{record.shipperPostalCode,jdbcType=VARCHAR},
RECIPIENT_CONTACT_NAME = #{record.recipientContactName,jdbcType=VARCHAR},
RECIPIENT_PHONE = #{record.recipientPhone,jdbcType=VARCHAR},
RECIPIENT_COMPANY = #{record.recipientCompany,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE1 = #{record.recipientAddrLine1,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE2 = #{record.recipientAddrLine2,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR},
RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR}
RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -624,8 +650,8 @@
<if test="shipperCity != null">
SHIPPER_CITY = #{shipperCity,jdbcType=VARCHAR},
</if>
<if test="shipperEmail != null">
SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
<if test="shipperPostalCode != null">
SHIPPER_POSTAL_CODE = #{shipperPostalCode,jdbcType=VARCHAR},
</if>
<if test="recipientContactName != null">
RECIPIENT_CONTACT_NAME = #{recipientContactName,jdbcType=VARCHAR},
......@@ -648,6 +674,12 @@
<if test="recipientCity != null">
RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
</if>
<if test="recipientPostalCode != null">
RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
</if>
<if test="docNondocFlag != null">
DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
</if>
</set>
where ID = #{id,jdbcType=NUMERIC}
</update>
......@@ -679,14 +711,16 @@
SHIPPER_ADDR_LINE1 = #{shipperAddrLine1,jdbcType=VARCHAR},
SHIPPER_ADDR_LINE2 = #{shipperAddrLine2,jdbcType=VARCHAR},
SHIPPER_CITY = #{shipperCity,jdbcType=VARCHAR},
SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
SHIPPER_POSTAL_CODE = #{shipperPostalCode,jdbcType=VARCHAR},
RECIPIENT_CONTACT_NAME = #{recipientContactName,jdbcType=VARCHAR},
RECIPIENT_PHONE = #{recipientPhone,jdbcType=VARCHAR},
RECIPIENT_COMPANY = #{recipientCompany,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE1 = #{recipientAddrLine1,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE2 = #{recipientAddrLine2,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR},
RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR}
RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}
where ID = #{id,jdbcType=NUMERIC}
</update>
<sql id="OracleDialectPrefix">
......
......@@ -23,6 +23,7 @@
<result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
<result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
<result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
<result column="CONFIRM_PROMPTS" jdbcType="NUMERIC" property="confirmPrompts" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -85,7 +86,8 @@
<sql id="Base_Column_List">
ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO,
UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, TYPE_NAME, STATUS, REMARK, CREATE_TIME,
CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
CONFIRM_PROMPTS
</sql>
<select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultMap="BaseResultMap">
<include refid="OracleDialectPrefix" />
......@@ -130,16 +132,16 @@
UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID,
TYPE_NAME, STATUS, REMARK,
CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
)
MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
CONFIRM_PROMPTS)
values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
#{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR},
#{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC},
#{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
#{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}
)
#{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR},
#{confirmPrompts,jdbcType=NUMERIC})
</insert>
<insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.User">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
......@@ -208,6 +210,9 @@
<if test="modifyUserName != null">
MODIFY_USER_NAME,
</if>
<if test="confirmPrompts != null">
CONFIRM_PROMPTS,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{id,jdbcType=NUMERIC},
......@@ -271,6 +276,9 @@
<if test="modifyUserName != null">
#{modifyUserName,jdbcType=VARCHAR},
</if>
<if test="confirmPrompts != null">
#{confirmPrompts,jdbcType=NUMERIC},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long">
......@@ -345,6 +353,9 @@
<if test="record.modifyUserName != null">
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
</if>
<if test="record.confirmPrompts != null">
CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -372,7 +383,8 @@
CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
CONFIRM_PROMPTS = #{record.confirmPrompts,jdbcType=NUMERIC}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -440,6 +452,9 @@
<if test="modifyUserName != null">
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
</if>
<if test="confirmPrompts != null">
CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC},
</if>
</set>
where ID = #{id,jdbcType=NUMERIC}
</update>
......@@ -464,7 +479,8 @@
CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
CONFIRM_PROMPTS = #{confirmPrompts,jdbcType=NUMERIC}
where ID = #{id,jdbcType=NUMERIC}
</update>
<sql id="OracleDialectPrefix">
......
......@@ -145,9 +145,9 @@ public class CeInfo implements Serializable {
private String shipperCity;
/**
* 发货人邮箱
* 发货人邮政编码
*/
private String shipperEmail;
private String shipperPostalCode;
/**
* 收件联系人姓名
......@@ -184,6 +184,16 @@ public class CeInfo implements Serializable {
*/
private String recipientCity;
/**
* 收件人邮政编码
*/
private String recipientPostalCode;
/**
* 文件或包裹(Y:包裹/ITEM，N:文件/DOC)
*/
private String docNondocFlag;
private static final long serialVersionUID = 1L;
public Long getId() {
......@@ -402,12 +412,12 @@ public class CeInfo implements Serializable {
this.shipperCity = shipperCity == null ? null : shipperCity.trim();
}
public String getShipperEmail() {
return shipperEmail;
public String getShipperPostalCode() {
return shipperPostalCode;
}
public void setShipperEmail(String shipperEmail) {
this.shipperEmail = shipperEmail == null ? null : shipperEmail.trim();
public void setShipperPostalCode(String shipperPostalCode) {
this.shipperPostalCode = shipperPostalCode == null ? null : shipperPostalCode.trim();
}
public String getRecipientContactName() {
......@@ -466,6 +476,22 @@ public class CeInfo implements Serializable {
this.recipientCity = recipientCity == null ? null : recipientCity.trim();
}
public String getRecipientPostalCode() {
return recipientPostalCode;
}
public void setRecipientPostalCode(String recipientPostalCode) {
this.recipientPostalCode = recipientPostalCode == null ? null : recipientPostalCode.trim();
}
public String getDocNondocFlag() {
return docNondocFlag;
}
public void setDocNondocFlag(String docNondocFlag) {
this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......@@ -499,7 +525,7 @@ public class CeInfo implements Serializable {
sb.append(", shipperAddrLine1=").append(shipperAddrLine1);
sb.append(", shipperAddrLine2=").append(shipperAddrLine2);
sb.append(", shipperCity=").append(shipperCity);
sb.append(", shipperEmail=").append(shipperEmail);
sb.append(", shipperPostalCode=").append(shipperPostalCode);
sb.append(", recipientContactName=").append(recipientContactName);
sb.append(", recipientPhone=").append(recipientPhone);
sb.append(", recipientCompany=").append(recipientCompany);
......@@ -507,6 +533,8 @@ public class CeInfo implements Serializable {
sb.append(", recipientAddrLine2=").append(recipientAddrLine2);
sb.append(", recipientAddrLine3=").append(recipientAddrLine3);
sb.append(", recipientCity=").append(recipientCity);
sb.append(", recipientPostalCode=").append(recipientPostalCode);
sb.append(", docNondocFlag=").append(docNondocFlag);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......
......@@ -110,9 +110,9 @@ public class Consignment implements Serializable {
private String shipperCity;
/**
* 发货人邮箱
* 发货人邮政编码
*/
private String shipperEmail;
private String shipperPostalCode;
/**
* 收件联系人姓名
......@@ -214,6 +214,27 @@ public class Consignment implements Serializable {
*/
private Long ceInfoId;
/**
* 收件人邮政编码
*/
private String recipientPostalCode;
/**
* 运单状态ID，
关联数据字典表。指定字典目录CODE：CONSIGNMENT_STATUS
*/
private Long statusId;
/**
* 运单状态名称(待上传、已上传、已发送)
*/
private String statusName;
/**
* 文件或包裹(Y:包裹/ITEM，N:文件/DOC)
*/
private String docNondocFlag;
private static final long serialVersionUID = 1L;
public Long getId() {
......@@ -376,12 +397,12 @@ public class Consignment implements Serializable {
this.shipperCity = shipperCity == null ? null : shipperCity.trim();
}
public String getShipperEmail() {
return shipperEmail;
public String getShipperPostalCode() {
return shipperPostalCode;
}
public void setShipperEmail(String shipperEmail) {
this.shipperEmail = shipperEmail == null ? null : shipperEmail.trim();
public void setShipperPostalCode(String shipperPostalCode) {
this.shipperPostalCode = shipperPostalCode == null ? null : shipperPostalCode.trim();
}
public String getRecipientContactName() {
......@@ -544,6 +565,38 @@ public class Consignment implements Serializable {
this.ceInfoId = ceInfoId;
}
public String getRecipientPostalCode() {
return recipientPostalCode;
}
public void setRecipientPostalCode(String recipientPostalCode) {
this.recipientPostalCode = recipientPostalCode == null ? null : recipientPostalCode.trim();
}
public Long getStatusId() {
return statusId;
}
public void setStatusId(Long statusId) {
this.statusId = statusId;
}
public String getStatusName() {
return statusName;
}
public void setStatusName(String statusName) {
this.statusName = statusName == null ? null : statusName.trim();
}
public String getDocNondocFlag() {
return docNondocFlag;
}
public void setDocNondocFlag(String docNondocFlag) {
this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......@@ -570,7 +623,7 @@ public class Consignment implements Serializable {
sb.append(", shipperAddrLine1=").append(shipperAddrLine1);
sb.append(", shipperAddrLine2=").append(shipperAddrLine2);
sb.append(", shipperCity=").append(shipperCity);
sb.append(", shipperEmail=").append(shipperEmail);
sb.append(", shipperPostalCode=").append(shipperPostalCode);
sb.append(", recipientContactName=").append(recipientContactName);
sb.append(", recipientPhone=").append(recipientPhone);
sb.append(", recipientCompany=").append(recipientCompany);
......@@ -591,6 +644,10 @@ public class Consignment implements Serializable {
sb.append(", modifyUserId=").append(modifyUserId);
sb.append(", modifyUserName=").append(modifyUserName);
sb.append(", ceInfoId=").append(ceInfoId);
sb.append(", recipientPostalCode=").append(recipientPostalCode);
sb.append(", statusId=").append(statusId);
sb.append(", statusName=").append(statusName);
sb.append(", docNondocFlag=").append(docNondocFlag);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......
......@@ -114,6 +114,11 @@ public class User implements Serializable {
*/
private String modifyUserName;
/**
* 是否弹出确认提醒框（0：不提醒，1：提醒）
*/
private Long confirmPrompts;
private static final long serialVersionUID = 1L;
public Long getId() {
......@@ -284,6 +289,14 @@ public class User implements Serializable {
this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
}
public Long getConfirmPrompts() {
return confirmPrompts;
}
public void setConfirmPrompts(Long confirmPrompts) {
this.confirmPrompts = confirmPrompts;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......@@ -311,6 +324,7 @@ public class User implements Serializable {
sb.append(", modifyTime=").append(modifyTime);
sb.append(", modifyUserId=").append(modifyUserId);
sb.append(", modifyUserName=").append(modifyUserName);
sb.append(", confirmPrompts=").append(confirmPrompts);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......
......@@ -1524,6 +1524,66 @@ public class UserExample {
addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
return (Criteria) this;
}
public Criteria andConfirmPromptsIsNull() {
addCriterion("CONFIRM_PROMPTS is null");
return (Criteria) this;
}
public Criteria andConfirmPromptsIsNotNull() {
addCriterion("CONFIRM_PROMPTS is not null");
return (Criteria) this;
}
public Criteria andConfirmPromptsEqualTo(Long value) {
addCriterion("CONFIRM_PROMPTS =", value, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsNotEqualTo(Long value) {
addCriterion("CONFIRM_PROMPTS <>", value, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsGreaterThan(Long value) {
addCriterion("CONFIRM_PROMPTS >", value, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsGreaterThanOrEqualTo(Long value) {
addCriterion("CONFIRM_PROMPTS >=", value, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsLessThan(Long value) {
addCriterion("CONFIRM_PROMPTS <", value, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsLessThanOrEqualTo(Long value) {
addCriterion("CONFIRM_PROMPTS <=", value, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsIn(List<Long> values) {
addCriterion("CONFIRM_PROMPTS in", values, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsNotIn(List<Long> values) {
addCriterion("CONFIRM_PROMPTS not in", values, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsBetween(Long value1, Long value2) {
addCriterion("CONFIRM_PROMPTS between", value1, value2, "confirmPrompts");
return (Criteria) this;
}
public Criteria andConfirmPromptsNotBetween(Long value1, Long value2) {
addCriterion("CONFIRM_PROMPTS not between", value1, value2, "confirmPrompts");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
......@@ -40,7 +40,7 @@
sys：系统 系统相关表，例如kafka表
log: 日志 日志记录表，例如邮件发送日志表
-->
<javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java">
<javaModelGenerator targetPackage="com.fedex.connect.common.model.sys" targetProject="src/main/java">
<!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
<property name="enableSubPackages" value="false"/>
<!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
......@@ -52,13 +52,13 @@
</javaModelGenerator>
<!-- 生成映射文件*.xml的位置-->
<sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common">
<sqlMapGenerator targetPackage="mapper.sys" targetProject="src/main/java/com/fedex/connect/common">
<!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
<property name="enableSubPackages" value="false"/>
</sqlMapGenerator>
<!-- 生成DAO的包名和位置 -->
<javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java">
<javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.sys" targetProject="src/main/java">
<!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
<property name="enableSubPackages" value="false"/>
</javaClientGenerator>
......@@ -91,18 +91,18 @@
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />
</table>
<table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
</table>
<!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......@@ -173,12 +173,12 @@
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
</table>
<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
package com.fedex.connect.common.dependencies.config;
import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
import com.fedex.connect.common.dependencies.contants.DictionaryConstants;
import com.fedex.connect.common.dependencies.contants.DigitConstants;
import com.fedex.connect.common.dependencies.service.bi.IDictionaryEntriesService;
import com.fedex.connect.common.dependencies.util.Utils;
import com.fedex.connect.common.model.bi.DictionaryEntries;
......@@ -24,20 +25,11 @@ import java.util.stream.Collectors;
@Component
@Order(1)
public class CacheSystem implements CommandLineRunner {
private static final Logger log = LoggerFactory.getLogger(CacheSystem.class);
@Autowired
IDictionaryEntriesService iDictionaryEntriesService;
// 静态缓存数据
public static List<DictionaryEntries> dictionaryListAll = new ArrayList<>();
public static Map<String, List<DictionaryEntries>> dictionaryMap = new HashMap<>();
public static Map<String, String> declarationTypeMap = new HashMap<>();
public static Map<String, String> deliveryStatusMap = new HashMap<>();
public static Map<String, String> operStatusMap = new HashMap<>();
public static List<DictionaryEntries> currencyCdList = new ArrayList<>();
//静态缓存数据
private Map<String, List<DictionaryEntries>> dictionaryMap;
@Override
public void run(String... args) {
......@@ -48,30 +40,51 @@ public class CacheSystem implements CommandLineRunner {
}
log.info("System init load to cache in memory start");
try{
CacheSystem.dictionaryListAll = dictionaryData;
if (CollectionUtils.isEmpty(CacheSystem.dictionaryListAll)){
List<DictionaryEntries> dictionaryListAll = dictionaryData;
if (CollectionUtils.isEmpty(dictionaryListAll)){
return;
}
CacheSystem.dictionaryMap = Utils.listOf(CacheSystem.dictionaryListAll).stream().filter(Objects::nonNull)
dictionaryMap = Utils.listOf(dictionaryListAll).stream().filter(Objects::nonNull)
.collect(Collectors.groupingBy(DictionaryEntries::getDictCode));
} catch (Exception e){
log.error("load cache error:{}",e);
}
log.info("System init load to cache in memory end");
}
List<DictionaryEntries> declarationTypeList = CacheSystem.dictionaryMap.get(DatabaseConstants.DICT_CUSTOMS_DECLARATION_TYPE_CODE);
CacheSystem.declarationTypeMap = Utils.listOf(declarationTypeList).stream()
.collect(Collectors.toMap(DictionaryEntries::getCode, DictionaryEntries::getEnglishName));
List<DictionaryEntries> deliveryStatusList = CacheSystem.dictionaryMap.get(DatabaseConstants.DICT_DELIVERY_STATUS_CODE);
CacheSystem.deliveryStatusMap = Utils.listOf(deliveryStatusList).stream()
.collect(Collectors.toMap(DictionaryEntries::getCode, DictionaryEntries::getEnglishName));
/**
* @Author mt
* @Description 获取目录层级下所有目录
* @Date 2024/11/4
* @param dicCode
* @return java.util.List<com.fedex.connect.common.model.bi.DictionaryEntries>
*/
public List<DictionaryEntries> getDictionarysByDicCode(String dicCode){
return dictionaryMap.get(dicCode);
}
List<DictionaryEntries> operStatusList = CacheSystem.dictionaryMap.get(DatabaseConstants.DICT_OPER_STATUS_CODE);
CacheSystem.operStatusMap = Utils.listOf(operStatusList).stream()
.collect(Collectors.toMap(DictionaryEntries::getCode, DictionaryEntries::getEnglishName));
/**
* @Author mt
* @Description 获取用户类型指定字典项
* @Date 2024/11/4
* @param code
* @return com.fedex.connect.common.model.bi.DictionaryEntries
*/
public DictionaryEntries getDicUserType(String code){
List<DictionaryEntries> filter = dictionaryMap.get(DictionaryConstants.USER_TYPE).stream().filter(p -> code.equals(p.getCode())).collect(Collectors.toList());
return filter.isEmpty() ? null : filter.get(DigitConstants.DIGIT_ZERO);
}
CacheSystem.currencyCdList = CacheSystem.dictionaryMap.get(DatabaseConstants.DICT_CURRENCY_CD_CODE);
} catch (Exception e){
log.error("load cache error:{}",e);
} log.info("System init load to cache in memory end");
/**
* @Author mt
* @Description 获取运单状态指定字典项
* @Date 2024/11/4
* @param code
* @return com.fedex.connect.common.model.bi.DictionaryEntries
*/
public DictionaryEntries getDicConsignmentStatus(String code){
List<DictionaryEntries> filter = dictionaryMap.get(DictionaryConstants.CONSIGNMENT_STATUS).stream().filter(p -> code.equals(p.getCode())).collect(Collectors.toList());
return filter.isEmpty() ? null : filter.get(DigitConstants.DIGIT_ZERO);
}
}
......
......@@ -12,57 +12,4 @@ public class DatabaseConstants {
*/
public static final Long GLOBAL_STATUS_VALID = 1L;
public static final Long GLOBAL_STATUS_DEL = 0L;
/**
* 定义用户操作类型常量
* 1：登录 2：退出 3：修改密码4：FCL登录注册。5：停用，6：启用
*/
public static final Long USER_OPER_LOGIN = 1L;
public static final Long USER_OPER_LOGOUT = 2L;
public static final Long USER_OPER_UPD_PWD = 3L;
public static final Long USER_OPER_FCL_REGISTER = 4L;
public static final Long USER_OPER_STOP = 5L;
public static final Long USER_OPER_INIT = 6L;
/**
* 用户类型
* 在线申报平台账号
*/
public static final String DICT_USER_GOOUP_CODE = "user_type";
public static final String DICT_USER_DEFAULT_CODE = "default";
public static final String DICT_USER_FEDEX_CODE = "fedex";
/**
* 角色类型
* admin
*/
public static final String DICT_ROLE_GOOUP_CODE = "role_type";
public static final String DICT_ROLE_DEFAULT_CODE = "admin";
/**
* 报关类别
*/
public static final String DICT_CUSTOMS_DECLARATION_TYPE_CODE = "customs_declaration_type";
/**
* 币种
*/
public static final String DICT_CURRENCY_CD_CODE = "currency_cd";
/**
* 提单状态
*/
public static final String DICT_DELIVERY_STATUS_CODE = "delivery_status";
/**
* 操作状态
*/
public static final String DICT_OPER_STATUS_CODE = "oper_status";
public static final String FCL_PREFIX = "FCL";
}
......
......@@ -11,18 +11,18 @@ public enum ConsignmentStatusEnum {
CONSIGNMENT_STATUS_03("consignmentStatus_03", "已发送");
private String code;
private String msg;
private String name;
ConsignmentStatusEnum(String code, String msg) {
ConsignmentStatusEnum(String code, String name) {
this.code = code;
this.msg = msg;
this.name = name;
}
public String getCode() {
return code;
}
public String getMsg() {
return msg;
public String getName() {
return name;
}
}
......
......@@ -11,18 +11,18 @@ public enum KafkaStatusEnum {
PROCESSING_FAILED(2L, "处理失败");
private Long code;
private String msg;
private String name;
KafkaStatusEnum(Long code, String msg) {
KafkaStatusEnum(Long code, String name) {
this.code = code;
this.msg = msg;
this.name = name;
}
public Long getCode() {
return code;
}
public String getMsg() {
return msg;
public String getName() {
return name;
}
}
\ No newline at end of file
......
......@@ -8,4 +8,11 @@ public interface IConsignmentRepository {
Consignment save(Consignment entity);
void saveAll(List<Consignment> list);
/**
* @Author mt
* @Description 根据运单号查找30天之前运单
* @Date 2024/11/4
*/
Consignment findThirtyDaysAgoConByCode(String consignmentCode);
}
......
package com.fedex.connect.kafka.repository.repo.impl;
import com.fedex.connect.common.dependencies.util.Utils;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.common.model.biz.ConsignmentExample;
import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
import com.fedex.connect.kafka.repository.repo.IConsignmentRepository;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@Slf4j
@Repository
public class ConsignmentRepositoryImpl extends AbstractDaoRepository implements IConsignmentRepository {
@Override
......@@ -31,4 +37,24 @@ public class ConsignmentRepositoryImpl extends AbstractDaoRepository implements
}
});
}
}
/**
* @Author mt
* @Description 根据运单号查找30天之前运单
* @Date 2024/11/4
* @param consignmentCode
* @return com.fedex.connect.common.model.biz.Consignment
*/
public Consignment findThirtyDaysAgoConByCode(String consignmentCode) {
//获取30天内运单数据
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -30);
Date thirtyDaysAgo = calendar.getTime();
ConsignmentExample example = new ConsignmentExample();
ConsignmentExample.Criteria criteria = example.createCriteria();
criteria.andConsignmentCodeEqualTo(consignmentCode);
criteria.andCreateTimeGreaterThan(thirtyDaysAgo);
example.setOrderByClause("CREATE_TIME DESC");
return Utils.first(consignmentMapper.selectByExample(example));
}
}
\ No newline at end of file
......
......@@ -54,8 +54,11 @@ public class Dm501ServiceImpl extends BaseService implements IDm501Service {
//该运单号不存在创建时间为1个月内CE数据
if (Objects.isNull(bizCeInfo)) {
CeInfo ceInfo = dm501Util.generateCeInfo(consignment501,kafKaTemporaryStorage.getSendTime());
Consignment consignment = dm501Util.generateConsignment(ceInfo);
this.saveCeInfoAndConsignment(ceInfo,consignment);
//ce数据解析正常，进行后续操作
if(Objects.nonNull(ceInfo)){
Consignment consignment = dm501Util.generateConsignment(ceInfo);
this.saveCeInfoAndConsignment(ceInfo,consignment);
}
}
}catch(Exception ex){
log.error("DM501消息处理异常：{}", ex.getMessage(),ex);
......@@ -74,7 +77,9 @@ public class Dm501ServiceImpl extends BaseService implements IDm501Service {
*/
@Transactional(rollbackFor = Exception.class)
public void saveCeInfoAndConsignment(CeInfo ceInfo, Consignment consignment){
consignmentRepository.save(consignment);
ceInfoRepository.save(ceInfo);
//绑定ceInfo表Id
consignment.setCeInfoId(ceInfo.getId());
consignmentRepository.save(consignment);
}
}
\ No newline at end of file
......
package com.fedex.connect.kafka.util;
import com.fedex.connect.common.dependencies.config.CacheSystem;
import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
import com.fedex.connect.common.dependencies.util.DateUtil;
import com.fedex.connect.common.model.bi.DictionaryEntries;
import com.fedex.connect.common.model.biz.CeInfo;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.kafka.constants.Constant;
import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501ConAddresses;
import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501Consignments;
import com.fedex.connect.kafka.repository.repo.IConsignmentRepository;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
......@@ -18,6 +24,11 @@ import java.util.Objects;
@Component
public class Dm501Util {
@Autowired
CacheSystem cacheSystem;
@Autowired
IConsignmentRepository consignmentRepository;
/**
* @Author mt
* @Description 生成CE数据实体
......@@ -55,11 +66,11 @@ public class Dm501Util {
/**
* 发件人信息处理
*/
this.generateCeInfoShipper();
this.generateCeInfoShipper(ceInfo,shipperAddress);
/**
* 收件人信息处理
*/
this.generateCeInfoRecipient();
this.generateCeInfoRecipient(ceInfo,recipientAddress);
return ceInfo;
}
......@@ -109,13 +120,29 @@ public class Dm501Util {
* @param
* @return void
*/
private void generateCeInfoShipper(){
private void generateCeInfoShipper(CeInfo ceInfo,Dm501ConAddresses shipperAddress){
//发件人国家
// String shipperCountry = shipperAddress.getCountry();
// //始发国(二字码)
// ceInfo.setShipperCountry(shipperCountry);
String shipperCountry = shipperAddress.getCountry();
//始发国(二字码)
ceInfo.setShipperCountry(shipperCountry);
//原产国全称
// ceInfo.setOriginCountry();
//发货联系人姓名
ceInfo.setShipperContactName(shipperAddress.getContactName());
//发货人手机号
ceInfo.setShipperPhone(shipperAddress.getContactPhoneNumber());
//发货人计费账号
ceInfo.setShipperAccount(shipperAddress.getAccount());
//发货人公司
ceInfo.setShipperCompany(shipperAddress.getCompanyName());
//发货人地址1
ceInfo.setShipperAddrLine1(shipperAddress.getAddressDesc1());
//发货人地址2
ceInfo.setShipperAddrLine2(shipperAddress.getAddressDesc2());
//发货人城市
ceInfo.setShipperCity(shipperAddress.getCityName());
//发货人邮政编码
ceInfo.setShipperPostalCode(shipperAddress.getPostalCode());
}
/**
......@@ -125,13 +152,29 @@ public class Dm501Util {
* @param
* @return void
*/
private void generateCeInfoRecipient(){
private void generateCeInfoRecipient(CeInfo ceInfo,Dm501ConAddresses recipientAddress){
//收件人国家
// String recipientCountry = recipientAddress.getCountry();
String recipientCountry = recipientAddress.getCountry();
// //目的国家二字码
// ceInfo.setRecipientCountry(recipientCountry);
ceInfo.setRecipientCountry(recipientCountry);
//目的国全称
// ceInfo.setDestinationCountry();
//收件联系人姓名
ceInfo.setRecipientContactName(recipientAddress.getContactName());
//收件人手机号
ceInfo.setRecipientPhone(recipientAddress.getContactPhoneNumber());
//收件人公司
ceInfo.setRecipientCompany(recipientAddress.getCompanyName());
//收件人地址1
ceInfo.setRecipientAddrLine1(recipientAddress.getAddressDesc1());
//收件人地址2
ceInfo.setRecipientAddrLine2(recipientAddress.getAddressDesc2());
//收件人地址3
ceInfo.setRecipientAddrLine3(recipientAddress.getAddressDesc3());
//收件人城市
ceInfo.setRecipientCity(recipientAddress.getCityName());
//收件人邮政编码
ceInfo.setRecipientPostalCode(recipientAddress.getPostalCode());
}
/**
......@@ -141,8 +184,30 @@ public class Dm501Util {
* @param ceInfo
* @return com.fedex.connect.common.model.biz.Consignment
*/
public Consignment generateConsignment(CeInfo ceInfo) {
return null;
public Consignment generateConsignment(CeInfo ceInfo) throws Exception{
Consignment rsConsignment = null;
/**
* 根据运单号查找30天之前运单
*/
Consignment consignment = consignmentRepository.findThirtyDaysAgoConByCode(ceInfo.getConsignmentCode());
if(Objects.isNull(consignment)){
Consignment resultConsignment = new Consignment();
BeanUtils.copyProperties(ceInfo,resultConsignment);
//运单状态赋值为"待上传"
DictionaryEntries consignmentDicEntries = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
resultConsignment.setStatusId(consignmentDicEntries.getId());
resultConsignment.setStatusName(consignmentDicEntries.getDescription());
/**
* 初始化表基础字段
*/
AssignmentFieldUtils.assignmentTableBaseField(resultConsignment);
rsConsignment = resultConsignment;
}else{
BeanUtils.copyProperties(ceInfo,consignment);
rsConsignment = consignment;
}
return rsConsignment;
}
/**
......