Commit 23fb938b3f4c5585d7458464211ab9eaa207292f

Authored by 王飞
1 parent 1ba0bae0

commit

src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
1 1 package com.zteits.irain.portal.web.govclouds;
  2 +import java.math.BigDecimal;
2 3 import java.util.ArrayList;
3 4 import java.util.Calendar;
4 5 import java.util.Date;
... ... @@ -648,7 +649,7 @@ public class DataGeneralizeController {
648 649 Date endTime = calendar.getTime();
649 650  
650 651 //往前倒三个月
651   - calendar.add(Calendar.MONTH, -3);
  652 + //calendar.add(Calendar.MONTH, -3);
652 653 calendar.add(Calendar.DAY_OF_MONTH, -1);
653 654 calendar.set(Calendar.MINUTE, 0);
654 655 calendar.set(Calendar.SECOND, 0);
... ... @@ -710,6 +711,16 @@ public class DataGeneralizeController {
710 711 return orderDTO;
711 712 }
712 713 orderDTO.setData(result.getData());
  714 + //分->元
  715 + BigDecimal hundred = new BigDecimal("100");
  716 + OrderTransDTO o = orderDTO.getData();
  717 + o.setAliTotalAmount(o.getAliTotalAmount().divide(hundred));
  718 + o.setCashTotalAmount(o.getCashTotalAmount().divide(hundred));
  719 + o.setPayedTotalAmount(o.getPayedTotalAmount().divide(hundred));
  720 + o.setWxTotalAmount(o.getWxTotalAmount().divide(hundred));
  721 + o.setYlTotalAmount(o.getYlTotalAmount().divide(hundred));
  722 + orderDTO.setData(o);
  723 +
713 724 logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(orderDTO));
714 725 return orderDTO;
715 726 }
... ...