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

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

@@ -5238,16 +5238,16 @@ public class GameDataServiceImpl implements IGameDataService {
         }
 
         //校验订单时间，必须包含在消耗时间内
-        if(dto.getOrderBeginDate()!=null && dto.getOrderEndDate()!=null){
-            //如果订单选择范围开始时间在消耗之前，那么就将订单时间设置为消耗开始时间
-            if(dto.getOrderBeginDate().isBefore(dto.getCostBeginDate())){
-                dto.setOrderBeginDate(dto.getCostBeginDate());
-            }
-            //如果订单选择范围结束时间在消耗之后，那么就将订单时间设置为消耗结束时间
-            if(dto.getOrderEndDate().isAfter(dto.getCostEndDate())){
-                dto.setOrderEndDate(dto.getCostEndDate());
-            }
-        }
+//        if(dto.getOrderBeginDate()!=null && dto.getOrderEndDate()!=null){
+//            //如果订单选择范围开始时间在消耗之前，那么就将订单时间设置为消耗开始时间
+//            if(dto.getOrderBeginDate().isBefore(dto.getCostBeginDate())){
+//                dto.setOrderBeginDate(dto.getCostBeginDate());
+//            }
+//            //如果订单选择范围结束时间在消耗之后，那么就将订单时间设置为消耗结束时间
+//            if(dto.getOrderEndDate().isAfter(dto.getCostEndDate())){
+//                dto.setOrderEndDate(dto.getCostEndDate());
+//            }
+//        }
 
         //如果订单时间为空，那么就最多查询消耗结束时间当天和前一天的数据
         if(dto.getOrderBeginDate()==null && dto.getOrderEndDate()==null){
@@ -5299,7 +5299,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
         //计算回收率  充值金额/总消耗
         for (FlowMonitorVO vo : list) {
-            DecimalFormat df = new DecimalFormat("#.00");
+            DecimalFormat df = new DecimalFormat("#.####");
 
             vo.setCostCount(costCount);
             vo.setCostBeginDate(dto.getCostBeginDate());
@@ -5649,7 +5649,7 @@ public class GameDataServiceImpl implements IGameDataService {
             //防止double转成科学计数法
             BigDecimal costBigDecimal = new BigDecimal(costCount);
             BigDecimal amountBigDecimal = new BigDecimal(amountCount);
-            BigDecimal bd = amountBigDecimal.divide(costBigDecimal, 2, RoundingMode.HALF_UP);
+            BigDecimal bd = amountBigDecimal.divide(costBigDecimal, 4, RoundingMode.HALF_UP);
             vo.setRecoveryCount(bd.doubleValue()*100);
         }
         return vo;
@@ -5701,13 +5701,13 @@ public class GameDataServiceImpl implements IGameDataService {
                 select day as order_date,
                        source_system,
                        ten_amount,
-                       if(yesterday_amount>0,round(ten_amount/yesterday_amount,2),0)*100 ten_rate,
+                       if(yesterday_amount>0,round(ten_amount/yesterday_amount,4),0)*100 ten_rate,
                        fourteen_amount,
-                       if(yesterday_amount>0,round(fourteen_amount/yesterday_amount,2),0)*100 fourteen_rate,
+                       if(yesterday_amount>0,round(fourteen_amount/yesterday_amount,4),0)*100 fourteen_rate,
                        seventeen_amount,
-                       if(yesterday_amount>0,round(seventeen_amount/yesterday_amount,2),0)*100 seventeen_rate,
+                       if(yesterday_amount>0,round(seventeen_amount/yesterday_amount,4),0)*100 seventeen_rate,
                        twentyfour_amount,
-                       if(yesterday_amount>0,round(twentyfour_amount/yesterday_amount,2),0)*100 twentyfour_rate,
+                       if(yesterday_amount>0,round(twentyfour_amount/yesterday_amount,4),0)*100 twentyfour_rate,
                        yesterday_amount
                 from (
                     select            day,