#FIX

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -782,7 +782,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             Integer hisRefundMoney = countByDateVO.getHisRefundMoney();
             Integer todayRefundMoney = countByDateVO.getTodayRefundMoney();
             //今日销售额 （扣除今日的订单的退款金额）
-            dayData.setSalesMoney(dayData.getSalesMoney() - todayRefundMoney);
+            if (dayData.getSalesMoney() == null) {
+                dayData.setSalesMoney(0);
+            } else {
+                dayData.setSalesMoney(dayData.getSalesMoney() - todayRefundMoney);
+            }
+
             dayData.setRefundMoney(hisRefundMoney + todayRefundMoney);
         }
 
@@ -794,7 +799,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             Integer hisMonthRefundMoney = countByMonthVO.getHisMonthRefundMoney();
             Integer monthRefundMoney = countByMonthVO.getMonthRefundMoney();
             monthData.setRefundMoney(hisMonthRefundMoney + monthRefundMoney);
-            monthData.setSalesMoney(monthData.getSalesMoney() - monthRefundMoney);
+            if (monthData.getSalesMoney() == null) {
+                monthData.setSalesMoney(0);
+            } else {
+                monthData.setSalesMoney(monthData.getSalesMoney() - monthRefundMoney);
+            }
+
         }
         vo.setDayBusinessData(copy(DeviceInfoDto.BusinessData.class, dayData));
         vo.setMonthBusinessData(copy(DeviceInfoDto.BusinessData.class, monthData));