Merge remote-tracking branch 'origin/master'

@@ -85,7 +85,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
         /**
          * 根据是否是DM501返回不同的提示
          */
-        if (StringUtils.isEmpty(consignment.getUserUuid())){
+        if (StringUtils.isEmpty(consignment.getUserUuid()) && StringUtils.isEmpty(consignment.getShipperAccount())){
             /**
              * 非501数据
              */

@@ -44,5 +44,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
 business_exception_30012=UUID不一致
 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
 business_exception_30014=运单信息加载失败，请稍后重试
-business_success_30015=提交成功
+business_success_30015=上传成功
 business_exception_30016=运单提交失败
\ No newline at end of file

@@ -44,5 +44,5 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
 business_exception_30012=UUID不一致
 business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
 business_exception_30014=运单信息加载失败，请稍后重试
-business_success_30015=提交成功
+business_success_30015=上传成功
 business_exception_30016=运单提交失败
\ No newline at end of file

@@ -32,7 +32,7 @@ public class SendFailedEmailTemplate implements EmailTemplate {
 
 
     interface FAILED_EMAIL_TITLE{
-        String TITLE = "Failure Alert";
+        String TITLE = "Failed task warning";
     }
 
     interface FAILED_EMAIL_BODY{

@@ -82,7 +82,7 @@ public class ResponseUtils {
 
     public <T> ResponseVo success(Object codeEnum,T data) {
         ResponseCodeBo responseCodeBo = this.ref(codeEnum);
-        return new ResponseVo<>(responseCodeBo.getCode(),responseCodeBo.getErrMsg(),data);
+        return new ResponseVo<>(200,responseCodeBo.getErrMsg(),data);
     }
 
     public <T> ResponseVo success(T data) {

@@ -9,4 +9,6 @@ public class PortFileDto {
     private String shipperContactName;
     private String shipperEmail;
     private String shipperPhone;
+    private String shipperAccount;
+    private String originCountry;
 }

@@ -8,4 +8,6 @@ public class PushZipEmailDto {
     private String shipperContactName;
     private String shipperEmail;
     private String shipperPhone;
+    private String shipperAccount;
+    private String originCountry;
 }

@@ -9,7 +9,7 @@ import java.util.List;
 @Mapper
 public interface AttachmentExtMapper {
 
-    @Select("SELECT a.FILE_PATH, c.DEST_IATA_CODE, c.CONSIGNMENT_CODE, c.SHIPPER_CONTACT_NAME, c.SHIPPER_EMAIL, c.SHIPPER_PHONE " +
+    @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 " +
             "FROM T_BIZ_ATTACHMENT a " +
             "JOIN T_BIZ_CONSIGNMENT c ON a.BIZ_ID = c.ID " +
             "WHERE a.BIZ_ID = #{bizId}")

@@ -88,6 +88,8 @@ public class ConFileEmailUtil {
             portFileDto.setShipperContactName(pushZipEmailDto.getShipperContactName());
             portFileDto.setShipperEmail(pushZipEmailDto.getShipperEmail());
             portFileDto.setShipperPhone(pushZipEmailDto.getShipperPhone());
+            portFileDto.setShipperAccount(pushZipEmailDto.getShipperAccount());
+            portFileDto.setOriginCountry(pushZipEmailDto.getOriginCountry());
         }
         String date = DateUtil.yyyyMMddHHmmss(new Date());
         String fileName = date + BaseSeparatorConstants.SEPARATOR_UNDERLINE + portCode + BaseConstants.FILE_SUFFIX_KEYS.ZIP;
@@ -209,20 +211,23 @@ public class ConFileEmailUtil {
 
         StringBuilder content = new StringBuilder();
         content.append("<font size=\"4\"><br/> " );
-        content.append("Consignment Code" + "：" + Optional.ofNullable(consignmentCode).orElse(""));
+        content.append("Tracking Number" + "：" + Optional.ofNullable(consignmentCode).orElse(""));
         content.append("<br/> " );
-        content.append("Contact Person" + "：" + Optional.ofNullable(portFileDto.getShipperContactName()).orElse(""));
+        content.append("Shipper Account" + "：" + Optional.ofNullable(portFileDto.getShipperAccount()).orElse(""));
         content.append("<br/> " );
-        content.append("Contact Person's Email" + "：" + Optional.ofNullable(portFileDto.getShipperEmail()).orElse(""));
+        content.append("Origin Country/Territory" + "：" + Optional.ofNullable(portFileDto.getOriginCountry()).orElse(""));
+        content.append("<br/> " );
+        content.append("Shipper" + "：" + Optional.ofNullable(portFileDto.getShipperContactName()).orElse(""));
+        content.append("<br/> " );
+        content.append("Shipper Email" + "：" + Optional.ofNullable(portFileDto.getShipperEmail()).orElse(""));
         content.append("<br/> " );
-        content.append("Contact Phone" + "：" + Optional.ofNullable(portFileDto.getShipperPhone()).orElse(""));
 
         content.append("</font><br/><br/> " );
         content.append("<div style=\"color:#808080;font-style:Arial;font-size:14px;\">" +
-                "This email was to send declaration files uploaded by customer on the FedEx online declaration platform to " +
-                Optional.ofNullable(to).orElse("edd@fedex.com") +
+                "This email was to send declaration files uploaded by customer on the FedEx iClear Connect System platform to " +
+                Optional.ofNullable(to).orElse("zelong.shao@erry.com") +
                 " through " +
-                Optional.ofNullable(from).orElse("donotreply@fedex.com") +
+                Optional.ofNullable(from).orElse("tao.mo@erry.com") +
                 ", please do not reply</div>");
         return content.toString();
     }