This commit is contained in:
parent
e74dcaa922
commit
9b18ad16bf
|
|
@ -113,7 +113,7 @@ public class StatisticsService extends BaseService {
|
||||||
// vipQuery.isNotNull("vip_id");
|
// vipQuery.isNotNull("vip_id");
|
||||||
// List<Map<String, Object>> vipMaps = chargeOrderMapper.selectMaps(vipQuery);
|
// List<Map<String, Object>> vipMaps = chargeOrderMapper.selectMaps(vipQuery);
|
||||||
QueryWrapper<ChargeOrder> commonQuery = new QueryWrapper<>();
|
QueryWrapper<ChargeOrder> commonQuery = new QueryWrapper<>();
|
||||||
commonQuery.select("create_date,sum(total_price)");
|
commonQuery.select("create_date,sum(total_price) as sum");
|
||||||
commonQuery.ge("pay_time", beginTime);
|
commonQuery.ge("pay_time", beginTime);
|
||||||
commonQuery.le("pay_time", endTime);
|
commonQuery.le("pay_time", endTime);
|
||||||
|
|
||||||
|
|
@ -151,6 +151,10 @@ public class StatisticsService extends BaseService {
|
||||||
OrganizationMember organizationMember = organizationMemberMapper.selectById(salePersonId);
|
OrganizationMember organizationMember = organizationMemberMapper.selectById(salePersonId);
|
||||||
vo.setSalePersonName(organizationMember.getName());
|
vo.setSalePersonName(organizationMember.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (map.get("sum") == null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("sum")));
|
vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("sum")));
|
||||||
vo.setCount(vo.getCount()+(Long) map.get("count"));
|
vo.setCount(vo.getCount()+(Long) map.get("count"));
|
||||||
RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type"));
|
RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type"));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue