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

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

@@ -21,6 +21,7 @@ import org.nutz.dao.util.cri.SimpleCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
 
@@ -102,15 +103,23 @@ public class AdsAccountRechargeRankingServiceImpl implements IAdsAccountRecharge
             result.forEach(vo -> {
                 if (vo.getClickRate() != null) {
                     vo.setClickRate(NumberUtil.multiply100(vo.getClickRate()).setScale(2, RoundingMode.HALF_UP));
+                } else {
+                    vo.setClickRate(BigDecimal.ZERO);
                 }
                 if (vo.getAvgAmount() != null) {
                     vo.setAvgAmount(vo.getAvgAmount().setScale(2, RoundingMode.HALF_UP));
+                } else {
+                    vo.setAvgAmount(BigDecimal.ZERO);
                 }
                 if (vo.getFirstRoi() != null) {
                     vo.setFirstRoi(NumberUtil.multiply100(vo.getFirstRoi()).setScale(2, RoundingMode.HALF_UP));
+                } else {
+                    vo.setFirstRoi(BigDecimal.ZERO);
                 }
                 if (vo.getRoi() != null) {
                     vo.setRoi(NumberUtil.multiply100(vo.getRoi()).setScale(2, RoundingMode.HALF_UP));
+                } else {
+                    vo.setRoi(BigDecimal.ZERO);
                 }
             });
             int beginIndex = (dto.getPageNum() - 1) * dto.getPageSize();

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

@@ -88,9 +88,13 @@ public class AdsAgentRechargeRankingServiceImpl implements IAdsAgentRechargeRank
             result.forEach(vo -> {
                 if (vo.getAvgAmount() != null) {
                     vo.setAvgAmount(vo.getAvgAmount().setScale(2, RoundingMode.HALF_UP));
+                } else {
+                    vo.setAvgAmount(BigDecimal.ZERO);
                 }
                 if (vo.getRoi() != null) {
                     vo.setRoi(NumberUtil.multiply100(vo.getRoi()).setScale(2, RoundingMode.HALF_UP));
+                } else {
+                    vo.setRoi(BigDecimal.ZERO);
                 }
             });
             int beginIndex = (dto.getPageNum() - 1) * dto.getPageSize();