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

@@ -5293,10 +5293,6 @@ public class GameDataServiceImpl implements IGameDataService {
 
         //获取总消耗
         Double costCount = getCostCount(dto);
-        if(costCount==null || costCount==0){
-            return new Page<>(list, pager);
-        }
-
         //计算回收率  充值金额/总消耗
         for (FlowMonitorVO vo : list) {
             DecimalFormat df = new DecimalFormat("#.####");
@@ -5304,18 +5300,21 @@ public class GameDataServiceImpl implements IGameDataService {
             vo.setCostCount(costCount);
             vo.setCostBeginDate(dto.getCostBeginDate());
             vo.setCostEndDate(dto.getCostEndDate());
-            if (vo.getTenAmount() != null && vo.getTenAmount() > 0) {
-                vo.setTenRecovery(Double.parseDouble(df.format(vo.getTenAmount() / costCount))*100);
-            }
-            if (vo.getFourteenAmount()!=null && vo.getFourteenAmount()>0){
-                vo.setFourteenRecovery(Double.parseDouble(df.format(vo.getFourteenAmount()/costCount))*100);
-            }
-            if (vo.getSeventeenAmount()!=null && vo.getSeventeenAmount()>0){
-                vo.setSeventeenRecovery(Double.parseDouble(df.format(vo.getSeventeenAmount()/costCount))*100);
-            }
-            if(vo.getTwentyfourAmount()!=null && vo.getTwentyfourAmount()>0){
-                vo.setTwentyfourRecovery(Double.parseDouble(df.format(vo.getTwentyfourAmount()/costCount))*100);
+            if(costCount!=null && costCount>0){
+                if (vo.getTenAmount() != null && vo.getTenAmount() > 0) {
+                    vo.setTenRecovery(Double.parseDouble(df.format(vo.getTenAmount() / costCount))*100);
+                }
+                if (vo.getFourteenAmount()!=null && vo.getFourteenAmount()>0){
+                    vo.setFourteenRecovery(Double.parseDouble(df.format(vo.getFourteenAmount()/costCount))*100);
+                }
+                if (vo.getSeventeenAmount()!=null && vo.getSeventeenAmount()>0){
+                    vo.setSeventeenRecovery(Double.parseDouble(df.format(vo.getSeventeenAmount()/costCount))*100);
+                }
+                if(vo.getTwentyfourAmount()!=null && vo.getTwentyfourAmount()>0){
+                    vo.setTwentyfourRecovery(Double.parseDouble(df.format(vo.getTwentyfourAmount()/costCount))*100);
+                }
             }
+
         }
         return new Page<>(list, pager);