From 23fb938b3f4c5585d7458464211ab9eaa207292f Mon Sep 17 00:00:00 2001 From: wangfei <1006884993@qq.com> Date: Wed, 6 Sep 2017 19:23:29 +0800 Subject: [PATCH] commit --- src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java b/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java index cd3e211..1b0a09d 100644 --- a/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java +++ b/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java @@ -1,4 +1,5 @@ package com.zteits.irain.portal.web.govclouds; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -648,7 +649,7 @@ public class DataGeneralizeController { Date endTime = calendar.getTime(); //往前倒三个月 - calendar.add(Calendar.MONTH, -3); + //calendar.add(Calendar.MONTH, -3); calendar.add(Calendar.DAY_OF_MONTH, -1); calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); @@ -710,6 +711,16 @@ public class DataGeneralizeController { return orderDTO; } orderDTO.setData(result.getData()); + //分->元 + BigDecimal hundred = new BigDecimal("100"); + OrderTransDTO o = orderDTO.getData(); + o.setAliTotalAmount(o.getAliTotalAmount().divide(hundred)); + o.setCashTotalAmount(o.getCashTotalAmount().divide(hundred)); + o.setPayedTotalAmount(o.getPayedTotalAmount().divide(hundred)); + o.setWxTotalAmount(o.getWxTotalAmount().divide(hundred)); + o.setYlTotalAmount(o.getYlTotalAmount().divide(hundred)); + orderDTO.setData(o); + logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(orderDTO)); return orderDTO; } -- libgit2 0.21.4