he2802 2 years ago
parent
commit
35050bab23

+ 10 - 10
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3366,28 +3366,28 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
             TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
             queryBo1.setDivideType(1);
             queryBo1.setDivideType(1);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
-            map.put("unDeductMoneyTotal",vo1.getUnDeductMoneyTotal());
-            map.put("unPayMoneyTotal",vo1.getUnPayMoneyTotal());
-            map.put("payMoneyTotal",vo1.getPayMoneyTotal());
-            map.put("deductMoneyTotal",vo1.getDeductMoneyTotal());
+            map.put("unDeductMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getUnDeductMoneyTotal());
+            map.put("unPayMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getUnPayMoneyTotal());
+            map.put("payMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getPayMoneyTotal());
+            map.put("deductMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getDeductMoneyTotal());
         }
         }
         if(bo.getTotalType()==3){
         if(bo.getTotalType()==3){
             //3业务员提成
             //3业务员提成
             TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
             TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
             queryBo1.setDivideType(2);
             queryBo1.setDivideType(2);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
-            map.put("unDeductMoneyTotal",vo1.getUnDeductMoneyTotal());
-            map.put("unPayMoneyTotal",vo1.getUnPayMoneyTotal());
-            map.put("payMoneyTotal",vo1.getPayMoneyTotal());
-            map.put("deductMoneyTotal",vo1.getDeductMoneyTotal());
+            map.put("unDeductMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getUnDeductMoneyTotal());
+            map.put("unPayMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getUnPayMoneyTotal());
+            map.put("payMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getPayMoneyTotal());
+            map.put("deductMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getDeductMoneyTotal());
         }
         }
         if(bo.getTotalType()==4){
         if(bo.getTotalType()==4){
             //4佣金结算
             //4佣金结算
             TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
             TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
             queryBo1.setDivideType(3);
             queryBo1.setDivideType(3);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
-            map.put("unPayMoneyTotal",vo1.getUnPayMoneyTotal());
-            map.put("payMoneyTotal",vo1.getPayMoneyTotal());
+            map.put("unPayMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getUnPayMoneyTotal());
+            map.put("payMoneyTotal",Validator.isEmpty(vo1)?0:vo1.getPayMoneyTotal());
         }
         }
 
 
         return map;
         return map;