#MOD 添加用户判断

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

@@ -7,6 +7,7 @@ import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceDataDto;
 import com.xy.dto.MercMiniDeviceDto;
 import com.xy.service.DeviceDataServiceImpl;
+import com.xy.service.OrderRefundService;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.R;
 import io.swagger.annotations.Api;
@@ -30,6 +31,7 @@ import java.util.List;
 public class MercMiniDeviceHomePageController {
 
     private final DeviceDataServiceImpl deviceDataService;
+    private final OrderRefundService refundService;
 
     @PostMapping("count")
     @ApiOperation("首页统计")
@@ -40,6 +42,9 @@ public class MercMiniDeviceHomePageController {
         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)) {
+            //今日退款成功订单金额
+
+            //今日销售额 （扣除今日的订单的退款金额）
             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());