|
|
|
@ -102,7 +102,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
|
|
|
|
|
}
|
|
|
|
|
JSONObject res = new JSONObject();
|
|
|
|
|
res.put("new_partners", clientAnalysisMapper.countNewClients(params));
|
|
|
|
|
res.put("total_partners", clientAnalysisMapper.countClients(params));
|
|
|
|
|
|
|
|
|
|
//res.put("total_partners", clientAnalysisMapper.countClients(params));
|
|
|
|
|
// 统计所有的商户,包括禁用的
|
|
|
|
|
res.put("total_partners", clientAnalysisMapper.countClientsAll(params));
|
|
|
|
|
stringRedisTemplate.boundValueOps("org_commonAnalysis3"+params.getString("org_id")+params.getString("begin")).set(res.toJSONString(), 5, TimeUnit.MINUTES);
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
@ -553,7 +556,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
private JSONObject getTodayChannelCount(JSONObject params){
|
|
|
|
|
String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf"};
|
|
|
|
|
String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf", "Rpay"};
|
|
|
|
|
JSONObject resp = new JSONObject();
|
|
|
|
|
for(String channel:channels) {
|
|
|
|
|
params.put("channel", channel);
|
|
|
|
|