#MOD 商家端小程序首页统计

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceHomePageController.java

@@ -37,23 +37,23 @@ public class MercMiniDeviceHomePageController {
         MercMiniDeviceDto.HomePageVO vo = new MercMiniDeviceDto.HomePageVO();
         Long mercId = MercAuthUtils.getMercId();
         //当天
+        MercMiniDeviceDto.DayCountVO day = new MercMiniDeviceDto.DayCountVO().setOrderNum(0).setSalesPrice(0).setRefundMoney(0);
         List<DeviceDataDto.Vo> mercDataOneDay = deviceDataService.getMercDataOneDay(mercId, DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN));
         if (CollUtil.isNotEmpty(mercDataOneDay)) {
-            MercMiniDeviceDto.DayCountVO day = new MercMiniDeviceDto.DayCountVO();
             day.setSalesPrice(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum());
             day.setOrderNum(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
             day.setRefundMoney(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getRefundMoney).sum());
-            vo.setDay(day);
         }
+        vo.setDay(day);
         //当月
+        MercMiniDeviceDto.MonthCountVO month = new MercMiniDeviceDto.MonthCountVO().setOrderNum(0).setSalesPrice(0).setRefundMoney(0);
         List<DeviceDataDto.Vo> mercDataOneMonth = deviceDataService.getMercDataOneMonth(mercId, DateUtil.format(new Date(), DatePattern.SIMPLE_MONTH_PATTERN));
         if (CollUtil.isNotEmpty(mercDataOneMonth)) {
-            MercMiniDeviceDto.MonthCountVO month = new MercMiniDeviceDto.MonthCountVO();
             month.setSalesPrice(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum());
             month.setOrderNum(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
             month.setRefundMoney(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getRefundMoney).sum());
-            vo.setMonth(month);
         }
+        vo.setMonth(month);
         return R.ok(vo);
     }
 }