提成优化,视频管理优化

This commit is contained in:
xiezhijun
2021-05-06 19:53:31 +08:00
parent 79f1b9b23c
commit 9f2b055dee
13 changed files with 179 additions and 47 deletions

View File

@ -9,6 +9,7 @@ import com.stdiet.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 业务提成比例对象 sys_commision
@ -30,6 +31,8 @@ public class SysCommision extends BaseEntity {
*/
private Long userId;
private List<Long> userIds;
/**
* 岗位id
*/

View File

@ -32,6 +32,9 @@ public class SysNutritionalVideo extends BaseEntity
@Excel(name = "视频封面URL")
private String coverUrl;
//预览URL
private String previewUrl;
/** 视频标题 */
@Excel(name = "视频标题")
private String title;

View File

@ -68,4 +68,6 @@ public interface SysCommisionMapper
* @return
*/
List<SysCommision> getAfterSaleAndNutri(SysCommision sysCommision);
List<Long> getAfterSaleId(SysCommision sysCommision);
}

View File

@ -62,4 +62,11 @@ public interface ISysCommisionService
public int deleteSysCommisionById(Long ruleId);
public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision);
/**
* 查询售后、营养师用户信息
* @param sysCommision
* @return
*/
List<Long> getAfterSaleId(SysCommision sysCommision);
}

View File

@ -39,4 +39,11 @@ public interface ISysCommissionDayService {
*/
AjaxResult calculateOrderCommissionDetail(SysCommision sysCommision);
/**
* 根据开始生效时间分类提成比例
* @param tmpComList
* @return
*/
Map<String, List<SysCommision>> getRateMapByStartTime(List<SysCommision> tmpComList);
}

View File

@ -98,4 +98,14 @@ public class SysCommisionServiceImpl implements ISysCommisionService
public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision) {
return sysCommisionMapper.selectSysCommisionDetail(sysCommision);
}
/**
* 查询售后、营养师用户信息
* @param sysCommision
* @return
*/
@Override
public List<Long> getAfterSaleId(SysCommision sysCommision){
return sysCommisionMapper.getAfterSaleId(sysCommision);
}
}

View File

@ -407,6 +407,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
* @param tmpComList
* @return
*/
@Override
public Map<String, List<SysCommision>> getRateMapByStartTime(List<SysCommision> tmpComList){
Map<String, List<SysCommision>> result = new TreeMap<>(new MyComparator());
for (SysCommision sysCommision : tmpComList) {