diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java index 46678935..219c4625 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java @@ -115,32 +115,9 @@ public class CuMemberSettleController extends BaseController { public AjaxResult grantBonus(String settleDate) { Date startDate = DateUtils.parseStringToDate(settleDate); if (DateUtils.compareDateBefore(DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate()), startDate)) { - // 只能发放7天以外的奖金! return AjaxResult.error(TransactionUtils.getContent(BonusMsgConstants.GRANT_VALIDATE_DATE)); } - - // 发放开始时间 - String startSettleDate = null; - // 发放结束时间 - String endSettleDate = null; - // 发放日期的天 - int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, startDate)); - // 发放最后一天 - int monthLast = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, DateUtils.currentMonthLastDate(startDate))); - if (dateDD == 15) { - // 15号,发 上月24号 到 本月7号 - startSettleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.setDays(DateUtils.addMonths(startDate, -1), 24)); - endSettleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.setDays(startDate, 24)); - } else if (dateDD == monthLast) { - // 最后一天,发 8号 到 23号 - startSettleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.setDays(startDate, 8)); - endSettleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.setDays(startDate, 23)); - } - if (null == startSettleDate) { - return AjaxResult.error("每月15号和每月最后一天才能发放"); - } - - iBonusGrantService.grantBonusByPeriod(SecurityUtils.getPkCountry(), startSettleDate); + iBonusGrantService.grantBonusByPeriod(SecurityUtils.getPkCountry(), settleDate); return AjaxResult.success(); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java index 523c7ec1..f9711a98 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java @@ -75,11 +75,6 @@ public class SystemFieldConstants { */ public static final String RANGE_TYPE = "range_type"; - /** - * 级别 - */ - public static final String PK_LEVEL = "pk_level"; - /** * 极差 */