From 168fdb50010ddcf26674850394ecf88fb615eb4b Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 16 Nov 2018 16:54:45 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E7=9A=84=E6=B6=88=E8=B4=B9=E6=80=BB?= =?UTF-8?q?=E9=A2=9D=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WxDateAmountRecordMapper.java | 3 --- .../service/impl/DataTowerServiceImpl.java | 26 ------------------- .../mapper/WxDateAmountRecordMapper.xml | 10 ------- 3 files changed, 39 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java index 2b2d7fffd..78b6b8d38 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxDateAmountRecordMapper.java @@ -12,7 +12,4 @@ public interface WxDateAmountRecordMapper extends CommonMapper> queryprice(String tenantId); - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 832a1a532..13675ea44 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -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> recordlist = wxDateAmountRecordMapper.queryprice(tenantId); - Map collect = recordlist.stream().collect(Collectors.toMap(m -> { - return DateUtils.date2String((Date) m.get("date"), "MM/dd"); - }, m -> { - return m.get("price"); - })); - - TreeMap recordmap = new TreeMap<>(); - recordmap.putAll(collect); - - /*WxDateAmountRecord wxDateAmountRecord = new WxDateAmountRecord(); - wxDateAmountRecord.setTenantId(tenantId); - wxDateAmountRecord.setType(0); - List records = wxDateAmountRecordMapper.findList(wxDateAmountRecord); - Map recordmap = records.stream(). - collect(Collectors.groupingBy(WxDateAmountRecord::getDate, - TreeMap::new, - Collectors.summingInt(r -> { - return r.getPayPrice().intValue(); - })));*/ - - datamap.put("records", recordmap); - return datamap; } diff --git a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml index e752c691d..0c89c8320 100644 --- a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml @@ -97,16 +97,6 @@ - - - - -