|
@@ -673,17 +673,20 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
ProfitReportKuaiShouVo vo = new ProfitReportKuaiShouVo();
|
|
|
//使用政策 返点类型和比例
|
|
|
Map<String,Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
|
- if(policyRateMap.getOrDefault("rebateType","").equals("0")){
|
|
|
- vo.setRebateType("返现");//返点类型
|
|
|
- }else if (policyRateMap.getOrDefault("rebateType","").equals("1")){
|
|
|
- vo.setRebateType("返货");
|
|
|
- }else if (policyRateMap.getOrDefault("rebateType","").equals("2")){
|
|
|
- vo.setRebateType("返现+返货");
|
|
|
+ if (!Check.isNull(policyRateMap)){
|
|
|
+ if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 0){
|
|
|
+ vo.setRebateType("返现");//返点类型
|
|
|
+ }else if (Integer.valueOf(policyRateMap.get("rebateType").toString())== 1){
|
|
|
+ vo.setRebateType("返货");
|
|
|
+ }else if (Integer.valueOf(policyRateMap.get("rebateType").toString())== 2){
|
|
|
+ vo.setRebateType("返现+返货");
|
|
|
+ }
|
|
|
+ vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"");//返点比列
|
|
|
}else {
|
|
|
vo.setRebateType("");
|
|
|
}
|
|
|
|
|
|
- vo.setRebateRate(policyRateMap.getOrDefault("rebateRate","")+"");//返点比列
|
|
|
+
|
|
|
// 时间段内 账户流水 信息
|
|
|
List<Map<String,Object>> listAccount = reportSettlementMapper.getProfitKuaiShouCost(map.get("accountId")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
|
listAccount.removeAll(Collections.singleton(null));
|