Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,6 @@ import com.xy.dto.MercMiniDeviceDto;
 import com.xy.dto.OrderRefundDto;
 import com.xy.service.DeviceDataServiceImpl;
 import com.xy.service.OrderRefundService;
-import com.xy.service.OrdersService;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.R;
 import io.swagger.annotations.Api;
@@ -36,7 +35,7 @@ public class MercMiniDeviceHomePageController {
 
     private DeviceDataServiceImpl deviceDataService;
     private OrderRefundService refundService;
-    private OrdersService ordersService;
+
 
     @PostMapping("count")
     @ApiOperation("首页统计")
@@ -54,6 +53,7 @@ public class MercMiniDeviceHomePageController {
             //今日销售额 （扣除今日的订单的退款金额）
             day.setDayHisRefundMoney(hisRefundMoney);
             day.setDayRefundMoney(todayRefundMoney);
+            //改为和更多数据中的今日收益一样
             day.setSalesPrice(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum() - todayRefundMoney);
             day.setOrderNum(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
             day.setRefundMoney(hisRefundMoney + todayRefundMoney);