Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
d0c8f394 1 parent db7d5b93

customer|流程代码调整

Inline Side-by-side
Showing 9 changed files with 22 additions and 13 deletions
...@@ -85,7 +85,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -85,7 +85,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
85 /** 85 /**
86 * 根据是否是DM501返回不同的提示 86 * 根据是否是DM501返回不同的提示
87 */ 87 */
88 - if (StringUtils.isEmpty(consignment.getUserUuid())){ 88 + if (StringUtils.isEmpty(consignment.getUserUuid()) && StringUtils.isEmpty(consignment.getShipperAccount())){
89 /** 89 /**
90 * 非501数据 90 * 非501数据
91 */ 91 */
......
...@@ -44,5 +44,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建 ...@@ -44,5 +44,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
44 business_exception_30012=UUID不一致 44 business_exception_30012=UUID不一致
45 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试 45 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
46 business_exception_30014=运单信息加载失败，请稍后重试 46 business_exception_30014=运单信息加载失败，请稍后重试
47 -business_success_30015=提交成功 47 +business_success_30015=上传成功
48 business_exception_30016=运单提交失败 48 business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -44,5 +44,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建 ...@@ -44,5 +44,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
44 business_exception_30012=UUID不一致 44 business_exception_30012=UUID不一致
45 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试 45 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
46 business_exception_30014=运单信息加载失败，请稍后重试 46 business_exception_30014=运单信息加载失败，请稍后重试
47 -business_success_30015=提交成功 47 +business_success_30015=上传成功
48 business_exception_30016=运单提交失败 48 business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -32,7 +32,7 @@ public class SendFailedEmailTemplate implements EmailTemplate { ...@@ -32,7 +32,7 @@ public class SendFailedEmailTemplate implements EmailTemplate {
32 32
33 33
34 interface FAILED_EMAIL_TITLE{ 34 interface FAILED_EMAIL_TITLE{
35 - String TITLE = "Failure Alert"; 35 + String TITLE = "Failed task warning";
36 } 36 }
37 37
38 interface FAILED_EMAIL_BODY{ 38 interface FAILED_EMAIL_BODY{
......
...@@ -82,7 +82,7 @@ public class ResponseUtils { ...@@ -82,7 +82,7 @@ public class ResponseUtils {
82 82
83 public <T> ResponseVo success(Object codeEnum,T data) { 83 public <T> ResponseVo success(Object codeEnum,T data) {
84 ResponseCodeBo responseCodeBo = this.ref(codeEnum); 84 ResponseCodeBo responseCodeBo = this.ref(codeEnum);
85 - return new ResponseVo<>(responseCodeBo.getCode(),responseCodeBo.getErrMsg(),data); 85 + return new ResponseVo<>(200,responseCodeBo.getErrMsg(),data);
86 } 86 }
87 87
88 public <T> ResponseVo success(T data) { 88 public <T> ResponseVo success(T data) {
......
...@@ -9,4 +9,6 @@ public class PortFileDto { ...@@ -9,4 +9,6 @@ public class PortFileDto {
9 private String shipperContactName; 9 private String shipperContactName;
10 private String shipperEmail; 10 private String shipperEmail;
11 private String shipperPhone; 11 private String shipperPhone;
12 + private String shipperAccount;
13 + private String originCountry;
12 } 14 }
......
...@@ -8,4 +8,6 @@ public class PushZipEmailDto { ...@@ -8,4 +8,6 @@ public class PushZipEmailDto {
8 private String shipperContactName; 8 private String shipperContactName;
9 private String shipperEmail; 9 private String shipperEmail;
10 private String shipperPhone; 10 private String shipperPhone;
11 + private String shipperAccount;
12 + private String originCountry;
11 } 13 }
......
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
9 @Mapper 9 @Mapper
10 public interface AttachmentExtMapper { 10 public interface AttachmentExtMapper {
11 11
12 - @Select("SELECT a.FILE_PATH, c.DEST_IATA_CODE, c.CONSIGNMENT_CODE, c.SHIPPER_CONTACT_NAME, c.SHIPPER_EMAIL, c.SHIPPER_PHONE " + 12 + @Select("SELECT a.FILE_PATH, c.DEST_IATA_CODE, c.CONSIGNMENT_CODE, c.SHIPPER_CONTACT_NAME, c.SHIPPER_EMAIL, c.SHIPPER_PHONE, c.SHIPPER_ACCOUNT, c.ORIGIN_COUNTRY " +
13 "FROM T_BIZ_ATTACHMENT a " + 13 "FROM T_BIZ_ATTACHMENT a " +
14 "JOIN T_BIZ_CONSIGNMENT c ON a.BIZ_ID = c.ID " + 14 "JOIN T_BIZ_CONSIGNMENT c ON a.BIZ_ID = c.ID " +
15 "WHERE a.BIZ_ID = #{bizId}") 15 "WHERE a.BIZ_ID = #{bizId}")
......
...@@ -88,6 +88,8 @@ public class ConFileEmailUtil { ...@@ -88,6 +88,8 @@ public class ConFileEmailUtil {
88 portFileDto.setShipperContactName(pushZipEmailDto.getShipperContactName()); 88 portFileDto.setShipperContactName(pushZipEmailDto.getShipperContactName());
89 portFileDto.setShipperEmail(pushZipEmailDto.getShipperEmail()); 89 portFileDto.setShipperEmail(pushZipEmailDto.getShipperEmail());
90 portFileDto.setShipperPhone(pushZipEmailDto.getShipperPhone()); 90 portFileDto.setShipperPhone(pushZipEmailDto.getShipperPhone());
91 + portFileDto.setShipperAccount(pushZipEmailDto.getShipperAccount());
92 + portFileDto.setOriginCountry(pushZipEmailDto.getOriginCountry());
91 } 93 }
92 String date = DateUtil.yyyyMMddHHmmss(new Date()); 94 String date = DateUtil.yyyyMMddHHmmss(new Date());
93 String fileName = date + BaseSeparatorConstants.SEPARATOR_UNDERLINE + portCode + BaseConstants.FILE_SUFFIX_KEYS.ZIP; 95 String fileName = date + BaseSeparatorConstants.SEPARATOR_UNDERLINE + portCode + BaseConstants.FILE_SUFFIX_KEYS.ZIP;
...@@ -209,20 +211,23 @@ public class ConFileEmailUtil { ...@@ -209,20 +211,23 @@ public class ConFileEmailUtil {
209 211
210 StringBuilder content = new StringBuilder(); 212 StringBuilder content = new StringBuilder();
211 content.append("<font size=\"4\"><br/> " ); 213 content.append("<font size=\"4\"><br/> " );
212 - content.append("Consignment Code" + "：" + Optional.ofNullable(consignmentCode).orElse("")); 214 + content.append("Tracking Number" + "：" + Optional.ofNullable(consignmentCode).orElse(""));
213 content.append("<br/> " ); 215 content.append("<br/> " );
214 - content.append("Contact Person" + "：" + Optional.ofNullable(portFileDto.getShipperContactName()).orElse("")); 216 + content.append("Shipper Account" + "：" + Optional.ofNullable(portFileDto.getShipperAccount()).orElse(""));
215 content.append("<br/> " ); 217 content.append("<br/> " );
216 - content.append("Contact Person's Email" + "：" + Optional.ofNullable(portFileDto.getShipperEmail()).orElse("")); 218 + content.append("Origin Country/Territory" + "：" + Optional.ofNullable(portFileDto.getOriginCountry()).orElse(""));
219 + content.append("<br/> " );
220 + content.append("Shipper" + "：" + Optional.ofNullable(portFileDto.getShipperContactName()).orElse(""));
221 + content.append("<br/> " );
222 + content.append("Shipper Email" + "：" + Optional.ofNullable(portFileDto.getShipperEmail()).orElse(""));
217 content.append("<br/> " ); 223 content.append("<br/> " );
218 - content.append("Contact Phone" + "：" + Optional.ofNullable(portFileDto.getShipperPhone()).orElse(""));
219 224
220 content.append("</font><br/><br/> " ); 225 content.append("</font><br/><br/> " );
221 content.append("<div style=\"color:#808080;font-style:Arial;font-size:14px;\">" + 226 content.append("<div style=\"color:#808080;font-style:Arial;font-size:14px;\">" +
222 - "This email was to send declaration files uploaded by customer on the FedEx online declaration platform to " + 227 + "This email was to send declaration files uploaded by customer on the FedEx iClear Connect System platform to " +
223 - Optional.ofNullable(to).orElse("edd@fedex.com") + 228 + Optional.ofNullable(to).orElse("zelong.shao@erry.com") +
224 " through " + 229 " through " +
225 - Optional.ofNullable(from).orElse("donotreply@fedex.com") + 230 + Optional.ofNullable(from).orElse("tao.mo@erry.com") +
226 ", please do not reply</div>"); 231 ", please do not reply</div>");
227 return content.toString(); 232 return content.toString();
228 } 233 }
......