|
@@ -549,6 +549,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
vo.setRewardCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("rewardCost","")+"");//赠款消耗
|
|
vo.setRewardCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("rewardCost","")+"");//赠款消耗
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
|
|
+ vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"),stringMap.get("endDate")));
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"),stringMap.get("endDate")));
|
|
}
|
|
}
|
|
@@ -575,6 +576,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
vo.setRewardCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("rewardCost","")+"");//赠款消耗
|
|
vo.setRewardCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("rewardCost","")+"");//赠款消耗
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
|
|
+ vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -617,7 +619,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
}
|
|
}
|
|
List<ProfitReportKuaiShouVo> resultList = new ArrayList<>(list.size());
|
|
List<ProfitReportKuaiShouVo> resultList = new ArrayList<>(list.size());
|
|
for (Map<String, Object> map : list) {
|
|
for (Map<String, Object> map : list) {
|
|
- /* //查看该账户 状态信息
|
|
|
|
|
|
+ //查看该账户 状态信息
|
|
QueryWrapper<CtopCwjsSettlementInfo> settlementAccountQw = new QueryWrapper<>();
|
|
QueryWrapper<CtopCwjsSettlementInfo> settlementAccountQw = new QueryWrapper<>();
|
|
settlementAccountQw.eq("account_id",map.get("accountId"));
|
|
settlementAccountQw.eq("account_id",map.get("accountId"));
|
|
//账户状态 0-开 1-关
|
|
//账户状态 0-开 1-关
|
|
@@ -628,7 +630,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
if (Check.isNull(settlementAccountList)){
|
|
if (Check.isNull(settlementAccountList)){
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
-*/
|
|
|
|
ProfitReportKuaiShouVo voSource = new ProfitReportKuaiShouVo();
|
|
ProfitReportKuaiShouVo voSource = new ProfitReportKuaiShouVo();
|
|
|
|
|
|
voSource.setAccountId(map.getOrDefault("accountId","")+"");//账户id
|
|
voSource.setAccountId(map.getOrDefault("accountId","")+"");//账户id
|
|
@@ -685,13 +686,13 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
vo.setRebateType("");
|
|
vo.setRebateType("");
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
// 时间段内 账户流水 信息
|
|
// 时间段内 账户流水 信息
|
|
List<Map<String,Object>> listAccount = reportSettlementMapper.getProfitKuaiShouCost(map.get("accountId")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
List<Map<String,Object>> listAccount = reportSettlementMapper.getProfitKuaiShouCost(map.get("accountId")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
listAccount.removeAll(Collections.singleton(null));
|
|
listAccount.removeAll(Collections.singleton(null));
|
|
vo.setCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cost","")+"");//总消耗
|
|
vo.setCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cost","")+"");//总消耗
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
|
|
+ vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"),stringMap.get("endDate")));
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"),stringMap.get("endDate")));
|
|
}
|
|
}
|
|
@@ -717,6 +718,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
vo.setCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cost","")+"");//总消耗
|
|
vo.setCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cost","")+"");//总消耗
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
vo.setCashCost(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("cashCost","")+"");//现金消耗
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource,vo,SettlementUtil.getNullPropertyNames(voSource));
|
|
|
|
+ vo.setTime(stringMap.get("startDate")+"----"+stringMap.get("endDate"));
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
}
|
|
}
|
|
|
|
|