diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java index b871990c7..e2ab8b621 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java @@ -26,10 +26,10 @@ public class SysOrderPause { /** * 订单id */ - @JsonIgnore + //@JsonIgnore private Long orderId; - @JsonIgnore + //@JsonIgnore private Long cusId; private String outId; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java index 48d5f0d2e..90aa114ef 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java @@ -731,7 +731,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { } //更新服务结束时间 if(ChronoUnit.DAYS.between(realEndDate,serverEndDate) > 0){ - serverEndDate = realEndDate; + //serverEndDate = realEndDate; } return getEveryYearMonthPauseDay(list, serverStartDate, serverEndDate); } @@ -759,7 +759,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { pauseStartDate = serverStartDate; } if(ChronoUnit.DAYS.between(serverEndDate, pauseEndDate) > 0){ - pauseEndDate = serverEndDate; + //pauseEndDate = serverEndDate; } //根据暂停记录获取该条记录在每年每月的暂停天数 Map orderYearMonthPauseDay = getEveryYearMonthDayCount(pauseStartDate, pauseEndDate, null); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index 23cf963b9..ae06cce4d 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -236,16 +236,11 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { if (beforeOrderLastPlan != null) { long differDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()), serverStartDate); //检查之前食谱的结束时间和目前该订单的开始时间是否连续 - if (differDay <= 1) { - /*if(differDay <= 0){ - serverStartDate = DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(1); - //更新该订单的开始时间 - sysOrderService.updateOrderStartTime(sysOrder, serverStartDate);1 7 1 3 2 - }*/ + if(differDay <= 1){ //判断前一个订单食谱是否满七天,不满则需要接上 int differNum = beforeOrderLastPlan.getEndNumDay() - beforeOrderLastPlan.getStartNumDay(); - if (differNum < 6) { + if(differNum < 6){ //更新该食谱计划 beforeOrderLastPlan.setEndNumDay(beforeOrderLastPlan.getStartNumDay() + 6); beforeOrderLastPlan.setEndDate(DateUtils.localDateToDate(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(6 - differNum))); @@ -328,9 +323,9 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) > 0) { pauseStartDate = planStartDate; } - if (ChronoUnit.DAYS.between(planEndDate, pauseEndDate) > 0) { + /*if (ChronoUnit.DAYS.between(planEndDate, pauseEndDate) > 0) { pauseEndDate = planEndDate; - } + }*/ //判断暂停记录是否从食谱计划开始时间开始的 if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) == 0) { planStartDate = pauseEndDate.plusDays(1);