|
|
@@ -41,8 +41,18 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
public Object info( String startTime, String endTime) {
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
endTime=endTime+" 23:59:59";
|
|
|
+ //不再计算私有,签单,渠道
|
|
|
AdminStatisticsBo adminStatisticsBo = adminMapper.adminStatisticsInfo(aid);
|
|
|
- if (adminStatisticsBo==null)adminStatisticsBo=new AdminStatisticsBo();
|
|
|
+ if (adminStatisticsBo==null){
|
|
|
+ adminStatisticsBo=new AdminStatisticsBo();
|
|
|
+ }else {
|
|
|
+ //从客户中计算再添加到adminStatisticsBo
|
|
|
+ AdminStatisticsBo ListCount = adminMapper.selectUserCount(aid, null, null);
|
|
|
+ adminStatisticsBo.setPrivateSum(ListCount.getPrivateSum());
|
|
|
+ adminStatisticsBo.setSignSum(ListCount.getSignSum());
|
|
|
+ adminStatisticsBo.setChannelSum(ListCount.getChannelSum());
|
|
|
+ }
|
|
|
+
|
|
|
if (adminStatisticsBo.getReceivables()==null) adminStatisticsBo.setReceivables(new BigDecimal(0));
|
|
|
AdminStatisticsBo asb = adminMapper.adminStatisticsInfoByTime(aid, startTime, endTime);
|
|
|
if (asb==null) {
|
|
|
@@ -52,11 +62,14 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
adminStatisticsBo.setRangeFollowSum(0);
|
|
|
adminStatisticsBo.setRangeOrderSum(0);
|
|
|
}else {
|
|
|
- adminStatisticsBo.setRangePrivateSum(asb.getRangePrivateSum());
|
|
|
- adminStatisticsBo.setRangeSignSum(asb.getRangeSignSum());
|
|
|
- adminStatisticsBo.setRangeChannelSum(asb.getRangeChannelSum());
|
|
|
adminStatisticsBo.setRangeFollowSum(asb.getRangeFollowSum());
|
|
|
adminStatisticsBo.setRangeOrderSum(asb.getRangeOrderSum());
|
|
|
+ //从客户中计算再添加到adminStatisticsBo
|
|
|
+ AdminStatisticsBo ListCount = adminMapper.selectUserCount(aid, startTime, endTime);
|
|
|
+ adminStatisticsBo.setRangePrivateSum(ListCount.getPrivateSum());
|
|
|
+ adminStatisticsBo.setRangeSignSum(ListCount.getSignSum());
|
|
|
+ adminStatisticsBo.setRangeChannelSum(ListCount.getChannelSum());
|
|
|
+
|
|
|
}
|
|
|
Integer rangePublicReleaseSum=adminMapper.adminStatisticsPublicReleaseByAidAndTime(aid, startTime, endTime);
|
|
|
if (rangePublicReleaseSum==null)rangePublicReleaseSum=0;
|