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

订单优化、提成分为审核、未审核

Browse Source
This commit is contained in:
xiezhijun
2021-03-01 19:00:01 +08:00
parent 7539ec6b7f
commit f92e07f1ed
21 changed files with 207 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java
View File

@@ -62,6 +62,4 @@ public interface ISysCommisionService
public int deleteSysCommisionById(Long ruleId);
public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision);
List<SysCommision> selectSysCommisionDayDetail(SysCommision sysCommision);
}

1
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java
View File

@@ -4,6 +4,7 @@ import com.stdiet.custom.domain.SysCommision;
import com.stdiet.custom.domain.SysCommissionDayDetail;
import com.stdiet.custom.domain.SysOrder;
import com.stdiet.custom.domain.SysOrderCommisionDayDetail;
import com.stdiet.custom.dto.request.SysOrderCommision;
import java.time.LocalDate;
import java.util.Date;

5
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java
View File

@@ -98,9 +98,4 @@ public class SysCommisionServiceImpl implements ISysCommisionService
public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision) {
return sysCommisionMapper.selectSysCommisionDetail(sysCommision);
}
@Override
public List<SysCommision> selectSysCommisionDayDetail(SysCommision sysCommision){
return sysCommisionMapper.selectSysCommisionDayDetail(sysCommision);
}
}

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

@@ -3,6 +3,7 @@ package com.stdiet.custom.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.custom.domain.*;
import com.stdiet.custom.dto.request.SysOrderCommision;
import com.stdiet.custom.mapper.SysCommisionMapper;
import com.stdiet.custom.mapper.SysOrderMapper;
import com.stdiet.custom.mapper.SysOrderPauseMapper;
@@ -32,7 +33,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
public List<SysCommissionDayDetail> calculateCommissionByDay(SysCommision sysCommision){
List<SysCommissionDayDetail> result = new ArrayList<>();
//查询用户
List<SysCommision> list = sysCommisionMapper.selectSysCommisionDayDetail(sysCommision);
List<SysCommision> list = sysCommisionMapper.getAfterSaleAndNutri(sysCommision);
//合计
SysCommissionDayDetail total = new SysCommissionDayDetail();
total.setTotalCommissionAmount(new BigDecimal(0));