From 69fceff4eeb874ae4e35f363d2563ab882a65068 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 13 May 2019 16:50:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E7=A7=9F=E7=8E=87=E8=B5=B0=E5=8A=BF?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201905131640__L_TRADE.sql | 5 ----- .../main/resources/db/migration/V201905131644__L_TRADE.sql | 5 +++++ .../java/com/iformall/service/impl/WxChartServiceImpl.java | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905131640__L_TRADE.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131640__L_TRADE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131640__L_TRADE.sql deleted file mode 100644 index 9cb364fc8..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905131640__L_TRADE.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE wx_merchant_trade_daily - ADD COLUMN trade_count int(10) DEFAULT 0 COMMENT ''交易笔数''; - -ALTER TABLE wx_merchant_trade_daily - ADD COLUMN proof varchar(500) DEFAULT NULL COMMENT ''凭证''; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql new file mode 100644 index 000000000..3e95db4bd --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql @@ -0,0 +1,5 @@ +ALTER TABLE wx_merchant_trade_daily + ADD COLUMN trade_count int(10) DEFAULT 0 COMMENT '交易笔数'; + +ALTER TABLE wx_merchant_trade_daily + ADD COLUMN proof varchar(500) DEFAULT NULL COMMENT '凭证'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 4df2b713a..c1a54a92f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -346,6 +346,7 @@ public class WxChartServiceImpl implements WxChartDataService { Map resultMap = new LinkedMap(); double rentTotal = 0; for (String key : map.keySet()) { + rentTotal += map.get(key); resultMap.put(key,formatDouble(rentTotal/all*100)+"%"); } return new ResultData(resultMap);