From a76897a494c174465e126c850f867060e90afeb5 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Wed, 21 Apr 2021 18:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=A4=A9=E6=8F=90=E6=88=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/service/impl/SysCommissionDayServiceImpl.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 c7a1de60f..0d508dfee 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
@@ -116,7 +116,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
      */
     public LocalDate getBaseServerEndDate(SysOrder sysOrder){
         LocalDate serverEndDate = null;
-        //服务开始时间，食谱开始时间
+        //服务开始时间，食谱开始时间或提成计算开始时间
         LocalDate serverStartDate = DateUtils.dateToLocalDate(sysOrder.getStartTime());
         //成交时间
         LocalDate orderDate = DateUtils.dateToLocalDate(sysOrder.getOrderTime());
@@ -596,6 +596,8 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
     public SysOrderCommisionDayDetail statisticsOrderMessage(SysOrder sysOrder, String serverScopeStartTime, String serverScopeEndTime){
         //提成计算开始时间（与食谱计划开始时间可能不同）
         LocalDate serverStartDate = DateUtils.dateToLocalDate(sysOrder.getCommissStartTime());
+        //提成计算需要按照提成计算开始时间
+        sysOrder.setStartTime(sysOrder.getCommissStartTime());
         //订单总服务月数
         int serverMonth = sysOrder.getServeTimeId().intValue()/30;
         //服务天数(不满一个月的零头)