|
|
|
@@ -43,9 +43,6 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
@Autowired |
|
|
|
WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxDateAmountRecordMapper wxDateAmountRecordMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCarCmdLogMapper wxCarCmdLogMapper; |
|
|
|
|
|
|
|
@@ -473,29 +470,6 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum(); |
|
|
|
datamap.put("shsbjg", shsbjg); |
|
|
|
|
|
|
|
List<Map<String, Object>> recordlist = wxDateAmountRecordMapper.queryprice(tenantId); |
|
|
|
Map<Object, Object> collect = recordlist.stream().collect(Collectors.toMap(m -> { |
|
|
|
return DateUtils.date2String((Date) m.get("date"), "MM/dd"); |
|
|
|
}, m -> { |
|
|
|
return m.get("price"); |
|
|
|
})); |
|
|
|
|
|
|
|
TreeMap<Object, Object> recordmap = new TreeMap<>(); |
|
|
|
recordmap.putAll(collect); |
|
|
|
|
|
|
|
/*WxDateAmountRecord wxDateAmountRecord = new WxDateAmountRecord(); |
|
|
|
wxDateAmountRecord.setTenantId(tenantId); |
|
|
|
wxDateAmountRecord.setType(0); |
|
|
|
List<WxDateAmountRecord> records = wxDateAmountRecordMapper.findList(wxDateAmountRecord); |
|
|
|
Map<Date, Integer> recordmap = records.stream(). |
|
|
|
collect(Collectors.groupingBy(WxDateAmountRecord::getDate, |
|
|
|
TreeMap::new, |
|
|
|
Collectors.summingInt(r -> { |
|
|
|
return r.getPayPrice().intValue(); |
|
|
|
})));*/ |
|
|
|
|
|
|
|
datamap.put("records", recordmap); |
|
|
|
|
|
|
|
return datamap; |
|
|
|
} |
|
|
|
|
|
|
|
|