判空

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

@@ -123,6 +123,9 @@ public class ReportController extends AbstractApiController {
                     .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
             // 执行查询，返回一个包含求和结果的对象列表
             Integer count = rechargeRecordService.countByCondition(c);
+            if (count == 0){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             c = new Condition(RechargeRecord.class);
             c.createCriteria()
                     .andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
@@ -141,6 +144,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             BigDecimal sum = rechargeRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             //充值订单数
             Condition c = new Condition(RechargeRecord.class);
             c.createCriteria().andEqualTo("status",2)
@@ -176,6 +182,9 @@ public class ReportController extends AbstractApiController {
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             BigDecimal sum = withdrawRecordService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             //提现订单数
             Condition c = new Condition(RechargeRecord.class);
             c.createCriteria().andEqualTo("status",4)
@@ -192,6 +201,9 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 18){
             HashMap map = new HashMap();
@@ -200,6 +212,9 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 19){
             HashMap map = new HashMap();
@@ -208,38 +223,53 @@ public class ReportController extends AbstractApiController {
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 20){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.PROMOTION_COMMISSION.getValue());
+            map.put("bizType",BizTypeEnum.PROMOTION_COMMISSION.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 21){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.OPEN_GROUP_RED_ENVELOPE.getValue());
+            map.put("bizType",BizTypeEnum.OPEN_GROUP_RED_ENVELOPE.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 22){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getValue());
+            map.put("bizType",BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }else if (query.getType() == 23){
             HashMap map = new HashMap();
-            map.put("bizType",BizTypeEnum.SIGN_RED_ENVELOPE.getValue());
+            map.put("bizType",BizTypeEnum.SIGN_RED_ENVELOPE.getKey());
             map.put("startTime",query.getDay()+" 00:00:00");
             map.put("endTime",query.getDay()+" 23:59:59");
             // 执行查询，返回一个包含求和结果的对象列表
             BigDecimal sum = redEnvelopeService.sumByStatus(map);
+            if (sum == null){
+                return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
+            }
             return ResultGenerator.genSuccessResult(sum);
         }
         return ResultGenerator.genSuccessResult(BigDecimal.ZERO);