From 38ee861d0351a58d2b30446962a5acd291c05762 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 16 Jul 2020 21:07:28 +1000 Subject: [PATCH] holiday config --- .../manage/application/web/SimpleClientApplyController.java | 4 ---- .../management/sysconfig/core/impls/ClearDateManagerImpl.java | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java index aa00e95e8..e0a0ef029 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java @@ -3,14 +3,11 @@ package au.com.royalpay.payment.manage.application.web; import au.com.royalpay.payment.manage.application.beans.ClientPreApplyBean; import au.com.royalpay.payment.manage.application.beans.ClientPreApplyStep1Bean; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; -import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; import au.com.royalpay.payment.tools.env.RequestEnvironment; import au.com.royalpay.payment.tools.env.SysConfigManager; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; @@ -19,7 +16,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.io.IOException; -import java.util.ArrayList; import java.util.List; @RestController diff --git a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/ClearDateManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/ClearDateManagerImpl.java index 2621ca5b4..a2f15a033 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/ClearDateManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/ClearDateManagerImpl.java @@ -32,6 +32,7 @@ public class ClearDateManagerImpl implements ClearDateManager { private JSONObject serializeHolidayDef(HolidayDefinition def) { JSONObject holiday = new JSONObject(); + holiday.put("holiday_id", def.getHolidayId()); holiday.put("holiday", new DateTime(def.getHoliday()).toString("yyyy/MM/dd")); holiday.put("description", def.getDescription()); holiday.put("regions", def.getRegions());