From edea626f73e63052d222cbe842171bde2754b952 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Tue, 11 May 2021 11:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=81=9C=E6=9F=A5=E8=AF=A2=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=9C=8D=E5=8A=A1=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E7=94=9F=E6=88=90=E9=A3=9F=E8=B0=B1?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BC=98=E5=8C=96=EF=BC=8C=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/service/impl/SysCommissionDayServiceImpl.java | 4 ++--
 .../custom/service/impl/SysRecipesPlanServiceImpl.java   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

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<String, Integer> 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 a4999a2d5..8717fe6aa 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,11 +236,6 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
             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
-                }*/
                 //判断前一个订单食谱是否满七天，不满则需要接上
                 int differNum = beforeOrderLastPlan.getEndNumDay() - beforeOrderLastPlan.getStartNumDay();
 
@@ -326,9 +321,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);