|
@@ -158,6 +158,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
vo.setRebateType("返货");
|
|
|
}else if (Integer.valueOf(policyRateMap.get("rebateType").toString())== 2){
|
|
|
vo.setRebateType("返现+返货");
|
|
|
+ }else if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 3){
|
|
|
+ vo.setRebateType("服务费");
|
|
|
}
|
|
|
vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"%");//返点比列
|
|
|
}else {
|
|
@@ -335,6 +337,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
SheetKuaiShouVo voSource = new SheetKuaiShouVo();
|
|
|
voSource.setAccountId(map.get("accountId")+"");
|
|
|
voSource.setKsId(map.get("ksId")+"");
|
|
|
+ voSource.setAccountName(map.get("accountName")+"");
|
|
|
|
|
|
//政策所有时间点
|
|
|
List<String> policyDaysList = new ArrayList<>();
|
|
@@ -372,6 +375,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
vo.setRebateType("返货");
|
|
|
} else if (Integer.valueOf(policyRateMap.get("rebateType").toString()) == 2) {
|
|
|
vo.setRebateType("返现+返货");
|
|
|
+ }else if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 3){
|
|
|
+ vo.setRebateType("服务费");
|
|
|
}
|
|
|
vo.setRebateRate(policyRateMap.getOrDefault("rebateRate", "") + "%");//返点比列
|
|
|
} else {
|
|
@@ -380,8 +385,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
|
|
|
// 时间段内 账户流水 信息
|
|
|
List<SheetKuaiShouVo> listInfo = reportSettlementMapper.getTransactionDayKuaiShouSheet(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
+
|
|
|
listInfo.removeAll(Collections.singleton(null));
|
|
|
- vo.setAccountName(listInfo.get(0).getAccountName());
|
|
|
vo.setDailyCharge(listInfo.stream().filter(v -> !Check.isNull(v.getDailyCharge())).map(SheetKuaiShouVo::getDailyCharge).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
vo.setRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getRealCharged())).map(SheetKuaiShouVo::getRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
vo.setContractRebateRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getContractRebateRealCharged())).map(SheetKuaiShouVo::getContractRebateRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
@@ -415,7 +420,6 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
// 时间段内 账户流水 信息
|
|
|
List<SheetKuaiShouVo> listInfo = reportSettlementMapper.getTransactionDayKuaiShouSheet(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
listInfo.removeAll(Collections.singleton(null));
|
|
|
- vo.setAccountName(listInfo.get(0).getAccountName());
|
|
|
vo.setDailyCharge(listInfo.stream().filter(v -> !Check.isNull(v.getDailyCharge())).map(SheetKuaiShouVo::getDailyCharge).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
vo.setRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getRealCharged())).map(SheetKuaiShouVo::getRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
vo.setContractRebateRealCharged(listInfo.stream().filter(v -> !Check.isNull(v.getContractRebateRealCharged())).map(SheetKuaiShouVo::getContractRebateRealCharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|