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

食谱计划页面弹窗样式优化、按天提成列表增加一列

Browse Source
This commit is contained in:
xiezhijun
2021-01-20 18:41:14 +08:00
parent 8c4dea035e
commit 8d725bed34
8 changed files with 209 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
total.setTotalCommissionAmount(new BigDecimal(0));
total.setTotalHasSentCommissionAmount(new BigDecimal(0));
total.setTotalNotSentCommissionAmount(new BigDecimal(0));
total.setNextMonthCommission(new BigDecimal(0));
if(list != null && list.size() > 0){
Map<Long, List<SysOrderCommisionDayDetail>> orderDetailMap = getOrderByList(sysCommision.getUserId());
SysCommissionDayDetail sysCommissionDayDetail = null;
@ -52,6 +53,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
total.setTotalCommissionAmount(total.getTotalCommissionAmount().add(sysCommissionDayDetail.getTotalCommissionAmount()));
total.setTotalHasSentCommissionAmount(total.getTotalHasSentCommissionAmount().add(sysCommissionDayDetail.getTotalHasSentCommissionAmount()));
total.setTotalNotSentCommissionAmount(total.getTotalNotSentCommissionAmount().add(sysCommissionDayDetail.getTotalNotSentCommissionAmount()));
total.setNextMonthCommission(total.getNextMonthCommission().add(sysCommissionDayDetail.getNextMonthCommission()));
}
}
total.setPostName("胜唐体控");
@ -166,6 +168,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
//未发放提成 = 总提成 - 已发放提成
sysCommissionDayDetail.setTotalNotSentCommissionAmount(totalCommissionAmount.subtract(totalHasSentCommissionAmount));
sysCommissionDayDetail.setSendDetailList(sendDetailList);
sysCommissionDayDetail.setNextMonthCommission(sendDetailList.size() > 0 ? (BigDecimal)sendDetailList.get(0).get("yearMonthCommission") : new BigDecimal(0));
}
/**判断该月提成是否已发放*/