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

Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
huangdeliang
2021-03-01 19:04:14 +08:00
parent 3d20c30edc f92e07f1ed
commit 4dd7a6f643
21 changed files with 207 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java
View File

@ -2,6 +2,7 @@ package com.stdiet.custom.mapper;
import java.util.List;
import com.stdiet.custom.domain.SysCommision;
import com.stdiet.custom.dto.request.SysOrderCommision;
/**
* 业务提成比例Mapper接口
@ -61,5 +62,10 @@ public interface SysCommisionMapper
public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision);
List<SysCommision> selectSysCommisionDayDetail(SysCommision sysCommision);
/**
* 查询售后、营养师用户信息
* @param sysCommision
* @return
*/
List<SysCommision> getAfterSaleAndNutri(SysCommision sysCommision);
}

3
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import com.stdiet.custom.domain.SysCommision;
import com.stdiet.custom.domain.SysCommissionDayDetail;
import com.stdiet.custom.domain.SysOrder;
import com.stdiet.custom.dto.request.SysOrderCommision;
import org.apache.ibatis.annotations.Param;
/**
@ -72,7 +73,7 @@ public interface SysOrderMapper
public BigDecimal selectAllOrderAmount(SysOrder sysOrder);
/**
* 获取订单信息
* 获取订单信息（按天提成计算）
* @return
*/
List<SysOrder> selectSimpleOrderMessage(SysCommision sysCommision);