Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!218 按天提成明细报错修改

Browse Source 
Merge pull request !218 from 德仔/xzj
This commit is contained in:
德仔
2021-04-21 18:45:13 +08:00
committed by Gitee
parent 4f75d8ed5e a76897a494
commit ac2e282b48
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
View File

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