设备列表销售统计

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

@@ -12,6 +12,7 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -815,7 +816,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
                 CountDto.OrderByCreateTimeAndMercId orderByCreateTimeAndMercId = new CountDto.OrderByCreateTimeAndMercId()
                         .setMerdId(mercId).setBeginTime(start).setEndTime(end).setDeviceIds(CollUtil.newArrayList(dId));
-
+                log.info("设备订单统计：{}", JSONUtil.toJsonPrettyStr(orderByCreateTimeAndMercId));
                 //完成订单
                 CountDto.SuccessVo successVo = R.feignCheckData(countApiService.orderBySuccess(orderByCreateTimeAndMercId));
 
@@ -1187,12 +1188,11 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<DeviceInfoDto.MyChartSeries2> series = new ArrayList<>();
         List<BigDecimal> data = new ArrayList<>();
         deviceTempRecords.forEach(d -> {
-            int tempValue = d.getTempValue();
+            Integer tempValue = d.getTempValue();
             LocalDateTime createTime = d.getCreateTime();
             String time = DateUtil.format(createTime, "HH:mm:ss");
             categories.add(time);
-            data.add(NumberUtil.toBigDecimal(tempValue));
-
+            data.add(tempValue == null ? null : NumberUtil.toBigDecimal(tempValue));
         });
         DeviceInfoDto.MyChartSeries2 myChartSeries = new DeviceInfoDto.MyChartSeries2();
         myChartSeries.setName(name);