Merge branch 'large_screen_display_feature'

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/OrderProfileDispayVo.java

@@ -64,6 +64,6 @@ public class OrderProfileDispayVo implements Serializable {
     }
 
     public BigDecimal getOrderAmount() {
-        return CollectionUtils.isEmpty(orderProfiles)?BigDecimal.ZERO:orderProfiles.stream().map(OrderProfileVo::getOrderAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
+        return CollectionUtils.isEmpty(orderProfiles)?BigDecimal.ZERO:orderAmount;
     }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderProfileDisplayBiz.java

@@ -89,7 +89,8 @@ public class OrderProfileDisplayBiz extends BaseBiz<OrderProfileDisplayMapper, O
         //2.1查询订单数据
         List<BaseOrderDTO> baseOrders = baseOrderBiz.findOrdersByDate(startDate, endDate);
         //2.2查询固定数据
-        List<OrderProfileDisplay> orderProfileDisplays = findOrderProfileDisplayDataByDate(startDate, endDate);
+        Date constantEndDate = DateUtil.offsetDay(endDate, -1).toJdkDate();
+        List<OrderProfileDisplay> orderProfileDisplays = findOrderProfileDisplayDataByDate(startDate, constantEndDate);
 
         CountDownLatch latch = new CountDownLatch(3);
         //3. 十大运营中心订单数据