pankomng

cif-service/src/main/java/com/txz/cif/web/mng/ReportController.java

@@ -64,12 +64,18 @@ public class ReportController extends AbstractApiController {
             Condition c = new Condition(User.class);
             c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59");
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else  if (query.getType() == 2){
             Condition  c = new Condition(User.class);
             c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 3){
             Condition  c = new Condition(User.class);
@@ -78,6 +84,9 @@ public class ReportController extends AbstractApiController {
             c.createCriteria().andLessThanOrEqualTo("lastLoginTime",date)
                     .andGreaterThanOrEqualTo("lastLoginTime",day7);
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 4){
             HashMap map = new HashMap();
@@ -85,6 +94,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             Integer num = rechargeRecordService.countByUserId(map);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 5){
             HashMap map = new HashMap();
@@ -92,6 +104,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             Integer num = flowService.countByUserId(map);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 6){
             HashMap map = new HashMap();
@@ -99,6 +114,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             Integer num = withdrawRecordService.countByUserId(map);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 9){
             //充值总金额
@@ -108,12 +126,18 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = rechargeRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         } else if (query.getType() == 8){
             Condition c = new Condition(RechargeRecord.class);
             c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             Integer num = userService.countByCondition(c);
+            if (num == null || num == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(num));
         } else if (query.getType() == 10){
             //充值成功率
@@ -165,6 +189,9 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = withdrawRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         } else if (query.getType() == 13){
             //提现订单数
@@ -173,6 +200,9 @@ public class ReportController extends AbstractApiController {
                     .andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             Integer count = withdrawRecordService.countByCondition(c);
+            if (count == null || count == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(BigDecimal.valueOf(count));
         } else if (query.getType() == 16){
             //平均提现金额