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);