From 7ab11ac86b6af4d20559ee6378f356e3acabae93 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 23 Apr 2019 16:09:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BC=9A=E5=91=98=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCUserDataController.java | 4 ++-- .../iformall/controller/WxChartDataController.java | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java index 3d4779aeb..a929cc5a3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java @@ -124,8 +124,8 @@ public class WxCUserDataController extends BaseController { weekVosCount += us.getCount(); } map.put("weekVosCount", weekVosCount); //周新增会员 - map.put("growCount", weekVosCount); //周新增会员 - map.put("importCount", weekVosCount); //周新增会员 + map.put("growCount", weekVosCount); //自然增长 + map.put("importCount", weekVosCount); //导入 return new ResultData(map); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java index 041506f22..ab3c95e73 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java @@ -27,16 +27,10 @@ public class WxChartDataController extends BaseController { @Autowired private WxChartDataService wxChartDataService; - @ApiOperation("chart=53首页数据:" + - "todayNewUserCount今日新增会员 weekNewUserCount近一周新增会员," + - "todayActiveUserCount今日活跃会员 weekActiveUserCount近一周活跃会员," + - "userTotalCount会员总数,growUserCount自然增长 importUserCount导入," + - "rentRate出租率 rentCount已租 notRentCount未出租," + - "notSignContract待签约合同个数 signContract已签约合同," + - "onlineActivity上架营销活动 todayReceive今日领取," + - "todayUserCount今日客流 growRate较昨日上涨," + - "todayCarCount今日车流 downRate较昨日下跌 carParkStatus车场状态," + - "msgLeave短信剩余 msgHasUse短信已使用" + + @ApiOperation("chart=49商铺出租数据:" + + "total商铺总数 totalShop店铺个数 totalPoint多径点位个数, rentTotal已出租总数 rentTotalShop已出租店铺 rentTotalPoint已出租点位" + + ",notRentTotal未出租总数 notRentTotalShop未出租店铺 notRentTotalPoint未出租点位" + + ","+ "--------------------------------------"+ "chart=50费用收缴数据:" + "ysje 应收金额 ssje 实收金额 zjsjl收缴率 rent*租赁收缴率 property*物业收缴率 deposit*押金收缴率 other*其他费用收缴率" +