no message

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

@@ -18,6 +18,7 @@ import java.util.Map;
 public enum FieldTypeEnum implements BaseEnum {
     CUSTOM("CUSTOM", "自定义"),
     YYYYMMDD("YYYYMMDD","日期(-)"),
+    YYYYNMMYDDR("YYYYMMDD","日期(文字)"),
 //    YYYYMMDDTIME("YYYYMMDDTIME","日期时间"),
     NEXT_YYYY("NEXT_YYYY","下一年"),
     YYYY("YYYY","年"),

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -186,7 +186,7 @@ public class AdminUserLogic {
                             .eq(WebsitContractSignRecord::getStatus, SignContractStatusEnum.OK.getKey())
                             .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                             .count();
-                    log.info("没有签成功并且审核通过未过期的记录，进行下一步检查{}", existCount);
+//                    log.info("没有签成功并且审核通过未过期的记录，进行下一步检查{}", existCount);
                     // 没有签成功并且审核通过未过期的记录，进行下一步检查
                     if (existCount == 0) {
                         // 查询是否有状态为待签约或待审核的
@@ -196,7 +196,7 @@ public class AdminUserLogic {
                                 .ge(WebsitContractSignRecord::getSignOverTime, DateUtil.formatDateTime(DateUtil.date()))
                                 .isNull(WebsitContractSignRecord::getCancelTime)
                                 .count();
-                        log.info("查询是否有状态为待签约或待审核的{}", existCount);
+//                        log.info("查询是否有状态为待签约或待审核的{}", existCount);
                         if (existCount == 0) {
                             List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.date());
                             if (CollectionUtil.isEmpty(contractList)) {
@@ -306,13 +306,13 @@ public class AdminUserLogic {
                                         websitContractSignItemService.saveBatch(signItemList);
                                         websitContractSignFieldService.saveBatch(signFieldList);
                                         adminUserCom.setIsJumpSign(true);
-                                        log.info("生成签约记录跳转");
+//                                        log.info("生成签约记录跳转");
                                         break;
                                     }
                                 }
                             }
                         } else {
-                            log.info("已有签约记录跳转");
+//                            log.info("已有签约记录跳转");
                             adminUserCom.setIsJumpSign(true);
                             break;
                         }

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

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.contract;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONArray;
@@ -298,7 +299,9 @@ public class WebsitContractSignLogic {
             return "";
         }
         JSONObject params = new JSONObject();
-        String formatDate = DateUtil.formatDate(DateUtil.date());
+        final DateTime curDate = DateUtil.date();
+        String formatDate = DateUtil.formatDate(curDate);
+        final String chineseDate = DateUtil.formatChineseDate(curDate, false, false);
         String[] dateSplit = formatDate.split("-");
 
         for (WebsitContractSignField field : fields) {
@@ -308,6 +311,9 @@ public class WebsitContractSignLogic {
             } else if (field.getFieldType().equals(FieldTypeEnum.YYYYMMDD.getKey())) {
                 params.set(field.getFieldName(), formatDate);
 
+            } else if (field.getFieldType().equals(FieldTypeEnum.YYYYNMMYDDR.getKey())) {
+                params.set(field.getFieldName(), chineseDate);
+
             } else if (field.getFieldType().equals(FieldTypeEnum.NEXT_YYYY.getKey())) {
                 params.set(field.getFieldName(), Integer.parseInt(dateSplit[0]) + 1);