diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index b2c67624d..7dcc11398 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -77,7 +77,7 @@ public class WxAppinfoController extends BaseController { asyncTaskExecutor.execute(new Runnable() { @Override public void run() { - String param = "t:md:"+merchant.getId(); + String param = merchant.getWeappScene(); ResultData resultData = exportQrcode(null,null,merchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); Map map = (Map)resultData.data; String url = map.get("url"); 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 7372e8f65..699b979d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -354,12 +354,6 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(new HashMap<>()); } - public static void main(String[] args) { - double a = 8; - double b = 9; - System.out.println(a/b); - } - public Map getMap(List days){ Map map = new LinkedMap(); for (String d:days) { @@ -2360,6 +2354,7 @@ public class WxChartServiceImpl implements WxChartDataService { double rentTotalShopRate = new Double(rentTotalShop)/ new Double(totalShop)*100; datamap.put("rentTotalShopRate",formatDouble(rentTotalShopRate)); double rentTotalPointRate = new Double(rentTotalPoint)/ new Double(totalPoint)*100; + logger.info("chartimpl rentTotalPoint:{},totalPoint:{}",rentTotalPoint,totalPoint); datamap.put("rentTotalPointRate",formatDouble(rentTotalPointRate)); return new ResultData(datamap); @@ -2527,9 +2522,14 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - public static double formatDouble(Double d){ + public double formatDouble(Double d){ String s = d+""; - String lt = s.substring(s.indexOf("."),s.length()); + int index = s.indexOf("."); + if(index == -1){ + logger.info("formatDouble is -1 d:"+d); + return d; + } + String lt = s.substring(index,s.length()); if(lt.length() >3){ s = s.substring(0,s.indexOf(".")+3); }