no message

mall-server-api/src/main/java/com/gree/mall/manager/enums/contract/FieldTypeEnum.java

@@ -16,25 +16,34 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum FieldTypeEnum implements BaseEnum {
-    YYYYMMDD("YYYYMMDD","日期"),
-    YYYYMMDDTIME("YYYYMMDDTIME","日期时间"),
+    CUSTOM("CUSTOM", "自定义"),
+    YYYYMMDD("YYYYMMDD","日期(-)"),
+//    YYYYMMDDTIME("YYYYMMDDTIME","日期时间"),
+    NEXT_YYYY("NEXT_YYYY","下一年"),
     YYYY("YYYY","年"),
     MM("MM","月"),
     DD("DD","日"),
-//    BANK_LINK_NAME("BANK_LINK_NAME","银行户名"),
-    BANK_DEPOSIT("BANK_DEPOSIT","开户行名称"),
-    BANK_ACCOUNT("BANK_ACCOUNT","银行卡号"),
-    CUSTOM("CUSTOM", "自定义"),
-    WEBSIT_NAME("WEBSIT_NAME", "网点名称"),
-    SHORT_NAME("SHORT_NAME", "网点简称"),
-    WEBSIT_ID("WEBSIT_ID", "网点编号"),
-    CA_LEGAL_NAME("CA_LEGAL_NAME","CA法人代表"),
-    ADDRESS("ADDRESS", "地址"),
-    EMAIL("EMAIL", "邮箱"),
-    TEL("TEL", "电话"),
-    FAX("FAX", "传真"),
-    ZIP_CODE("ZIP_CODE", "邮编"),
-
+    Y_WEBSIT_NAME("WEBSIT_NAME", "乙方名称"),
+    Y_WEBSIT_ID("WEBSIT_ID", "乙方编号"),
+    Y_EMAIL("EMAIL", "乙方邮箱"),
+    Y_ADDRESS("ADDRESS", "乙方地址"),
+    Y_TEL("TEL", "乙方电话"),
+    Y_FAX("FAX", "乙方传真"),
+    Y_ZIP_CODE("ZIP_CODE", "乙方邮编"),
+    Y_BANK_DEPOSIT("BANK_DEPOSIT","乙方开户行"),
+    Y_BANK_ACCOUNT("BANK_ACCOUNT","乙方账号"),
+    Y_LEGAL_NAME("CA_LEGAL_NAME","乙方负责人"),
+    WEBSIT_NAME("WEBSIT_NAME", "甲方名称"),
+    SHORT_NAME("SHORT_NAME", "甲方简称"),
+    ADDRESS("ADDRESS", "甲方地址"),
+    TEL("TEL", "甲方电话"),
+    FAX("FAX", "甲方传真"),
+    ZIP_CODE("ZIP_CODE", "甲方邮编"),
+//    EMAIL("EMAIL", "甲方邮箱"),
+    BANK_DEPOSIT("BANK_DEPOSIT","甲方开户行"),
+    BANK_ACCOUNT("BANK_ACCOUNT","甲方账号"),
+    CA_LEGAL_NAME("CA_LEGAL_NAME","甲方负责人"),
+//    WEBSIT_ID("WEBSIT_ID", "甲方编号"),
     ;
 
     @JsonValue
@@ -47,9 +56,10 @@ public enum FieldTypeEnum implements BaseEnum {
      * @return
      */
     public static Map<String, Object> websitList() {
-        Map<String, Object> fieldMap = EnumUtil.getNameFieldMap(FieldTypeEnum.class, "value");
-        ArrayList<FieldTypeEnum> fieldTypeEnums = Lists.newArrayList(CUSTOM, YYYYMMDD, YYYYMMDDTIME, YYYY, MM, DD, WEBSIT_ID,
-                WEBSIT_NAME, SHORT_NAME, CA_LEGAL_NAME,ADDRESS, BANK_DEPOSIT, BANK_ACCOUNT, EMAIL, TEL, FAX, ZIP_CODE);
+        Map<String, Object> fieldMap = EnumUtil.getNameFieldMap(FieldTypeEnum.class, "remark");
+        ArrayList<FieldTypeEnum> fieldTypeEnums = Lists.newArrayList(CUSTOM, YYYYMMDD, NEXT_YYYY, YYYY, MM,
+                DD, Y_WEBSIT_NAME, Y_WEBSIT_ID, Y_EMAIL, Y_ADDRESS, Y_TEL, Y_FAX, Y_ZIP_CODE, WEBSIT_NAME,
+                SHORT_NAME, ADDRESS, TEL, FAX, ZIP_CODE, BANK_DEPOSIT, BANK_ACCOUNT, CA_LEGAL_NAME);
         Map<String, Object> map = new LinkedHashMap<>();
         for (FieldTypeEnum typeEnum : fieldTypeEnums) {
             map.put(typeEnum.getKey(), fieldMap.get(typeEnum.getKey()));

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -268,6 +268,8 @@ public class WebsitContractSignLogic {
                 .eq(CompanyCaAuth::getFadadaAuthAutoStatus, IsYesNoEnum.YES.getKey())
                 .one();
 
+        final AdminWebsit parentWebsit = adminWebsitService.getById(websit.getParentId());
+
         if (Objects.isNull(companyCaAuth)) {
             throw new RemoteServiceException("未找到上级网点的CA认证记录");
         }
@@ -282,34 +284,79 @@ public class WebsitContractSignLogic {
         for (WebsitContractSignField field : fields) {
             if (field.getFieldType().equals(FieldTypeEnum.CUSTOM.getKey())) {
                 params.set(field.getFieldName(), field.getFieldValue());
-            } else if (field.getFieldType().equals(FieldTypeEnum.CA_LEGAL_NAME.getKey())) {
-                params.set(field.getFieldName(), companyCaAuth.getLegalName());
-            } else if (field.getFieldType().equals(FieldTypeEnum.WEBSIT_NAME.getKey())) {
-                params.set(field.getFieldName(), websit.getName());
-            } else if (field.getFieldType().equals(FieldTypeEnum.SHORT_NAME.getKey())) {
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.YYYYMMDD.getKey())) {
+                params.set(field.getFieldName(), formatDate);
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.NEXT_YYYY.getKey())) {
+                params.set(field.getFieldName(), Integer.parseInt(dateSplit[0]) + 1);
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.YYYY.getKey())) {
+                params.set(field.getFieldName(), dateSplit[0]);
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.MM.getKey())) {
+                params.set(field.getFieldName(), dateSplit[1]);
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.DD.getKey())) {
+                params.set(field.getFieldName(), dateSplit[2]);
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_WEBSIT_NAME.getKey())) {
                 params.set(field.getFieldName(), websit.getName());
-            } else if (field.getFieldType().equals(FieldTypeEnum.WEBSIT_ID.getKey())) {
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_WEBSIT_ID.getKey())) {
                 params.set(field.getFieldName(), websit.getWebsitId());
-            } else if (field.getFieldType().equals(FieldTypeEnum.EMAIL.getKey())) {
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_EMAIL.getKey())) {
                 params.set(field.getFieldName(), Optional.ofNullable(websit.getEmail()).orElse(""));
-            } else if (field.getFieldType().equals(FieldTypeEnum.ADDRESS.getKey())) {
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_ADDRESS.getKey())) {
                 params.set(field.getFieldName(), Optional.ofNullable(websit.getAddress()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_TEL.getKey())) {
+                params.set(field.getFieldName(), Optional.ofNullable(websit.getWebsitPhone()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_FAX.getKey())) {
+                params.set(field.getFieldName(), Optional.ofNullable(websit.getFax()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_ZIP_CODE.getKey())) {
+                params.set(field.getFieldName(), Optional.ofNullable(websit.getZipCode()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_BANK_DEPOSIT.getKey())) {
+                params.set(field.getFieldName(), Optional.ofNullable(websit.getOpenBank()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_BANK_ACCOUNT.getKey())) {
+                params.set(field.getFieldName(), Optional.ofNullable(websit.getBankAccount()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.Y_LEGAL_NAME.getKey())) {
+                params.set(field.getFieldName(), websit.getLegalName());
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.WEBSIT_NAME.getKey())) {
+                params.set(field.getFieldName(), parentWebsit.getName());
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.SHORT_NAME.getKey())) {
+                params.set(field.getFieldName(), companyCaAuth.getShortName());
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.ADDRESS.getKey())) {
+                params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getAddress()).orElse(""));
+
             } else if (field.getFieldType().equals(FieldTypeEnum.TEL.getKey())) {
-                params.set(field.getFieldName(), Optional.ofNullable(websit.getLinkMobile()).orElse(""));
+                params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getLinkMobile()).orElse(""));
+
             } else if (field.getFieldType().equals(FieldTypeEnum.FAX.getKey())) {
-                params.set(field.getFieldName(), Optional.ofNullable(websit.getLegalMobile()).orElse(""));
+                params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getLegalMobile()).orElse(""));
+
             } else if (field.getFieldType().equals(FieldTypeEnum.ZIP_CODE.getKey())) {
-                params.set(field.getFieldName(), Optional.ofNullable(websit.getZipCode()).orElse(""));
+                params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getZipCode()).orElse(""));
+
             } else if (field.getFieldType().equals(FieldTypeEnum.BANK_DEPOSIT.getKey())) {
-                params.set(field.getFieldName(), Optional.ofNullable(websit.getOpenBank()).orElse(""));
+                params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getOpenBank()).orElse(""));
+
             } else if (field.getFieldType().equals(FieldTypeEnum.BANK_ACCOUNT.getKey())) {
-                params.set(field.getFieldName(), Optional.ofNullable(websit.getBankAccount()).orElse(""));
-            } else if (field.getFieldType().equals(FieldTypeEnum.YYYY.getKey())) {
-                params.set(field.getFieldName(), dateSplit[0]);
-            } else if (field.getFieldType().equals(FieldTypeEnum.MM.getKey())) {
-                params.set(field.getFieldName(), dateSplit[1]);
-            } else if (field.getFieldType().equals(FieldTypeEnum.DD.getKey())) {
-                params.set(field.getFieldName(), dateSplit[2]);
+                params.set(field.getFieldName(), Optional.ofNullable(parentWebsit.getBankAccount()).orElse(""));
+
+            } else if (field.getFieldType().equals(FieldTypeEnum.CA_LEGAL_NAME.getKey())) {
+                params.set(field.getFieldName(), companyCaAuth.getLegalName());
+
             } else {
                 throw new RemoteServiceException("找不到填充类型");
             }