Merge remote-tracking branch 'origin/package' into package

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameServerServiceImpl.java

@@ -1027,7 +1027,7 @@ public class GameServerServiceImpl implements IGameServerService {
                 /*注册人数0/创角人数1/活跃人数2/付费人数3/付费金额4/滚服人数5/滚服付费人数6/滚服付费金额7/ （游戏区服数据）*/
                 String[] temps = ((String) dayNTotalFieldMap.getT1().get(vo)).split("/");
                 //付费金额
-                BigDecimal amount = new BigDecimal(temps[4]);
+                BigDecimal amount = new BigDecimal(temps[4]).setScale(2, RoundingMode.HALF_UP);
                 //滚服付费金额
                 BigDecimal rollServerAmount = new BigDecimal(temps[7]);
                 //不同留存数据
@@ -1130,7 +1130,7 @@ public class GameServerServiceImpl implements IGameServerService {
                 /*注册人数0/创角人数1/活跃人数2/付费人数3/付费金额4/滚服人数5/滚服付费人数6/滚服付费金额7/ （游戏区服数据）*/
                 String[] temps = ((String) dayNTotalFieldMap.getT1().get(vo)).split("/");
                 //付费金额
-                BigDecimal amount = new BigDecimal(temps[4]);
+                BigDecimal amount = new BigDecimal(temps[4]).setScale(2, RoundingMode.HALF_UP);
                 //滚服付费金额
                 BigDecimal rollServerAmount = new BigDecimal(temps[7]);
                 //设置trend对象

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/IMediaDataServiceImpl.java

@@ -1254,7 +1254,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                 //得到需要计算的值
                 String[] temps = ((String) dayNTotalFieldMap.getT1().get(vo)).split("/");
                 //dn的金额总计
-                BigDecimal dNAmount = new BigDecimal(temps[0]);
+                BigDecimal dNAmount = new BigDecimal(temps[0]).setScale(2, RoundingMode.HALF_UP);
                 //d1-dn的金额总计
                 BigDecimal d1ToDNTotalAmount = new BigDecimal(temps[1]);
                 //d1-dn的消耗总计（排除了未到时间的cost）