Merge branch 'master' into dev

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

@@ -156,8 +156,9 @@ public class OrderProfileDisplayBiz extends BaseBiz<OrderProfileDisplayMapper, O
         //2.支付终端统计
         wrapToPayProfileWithPayTerminal(baseOrders, orderAmountConstant, largeScreenDisplayConstantDataBo, orderPayProfileDispalyVo);
 
+        BigDecimal realOrderAmount = baseOrders.stream().map(BaseOrderDTO::getRealAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         //累计订单金额
-        orderProfileDispayVo.setOrderAmount(orderAmountConstant);
+        orderProfileDispayVo.setOrderAmount(orderAmountConstant.add(realOrderAmount));
         orderProfileDispayVo.setOrderPayProfileDisplay(orderPayProfileDispalyVo);
         return orderProfileDispayVo;
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/CompanyOrderReceivedStatiscsAdminController.java

@@ -53,6 +53,8 @@ public class CompanyOrderReceivedStatiscsAdminController {
       public void exportCompanyPerformance(@RequestBody CompanyPerformanceFindDTO companyPerformanceFindDTO, HttpServletResponse response){
 
           try {
+              companyPerformanceFindDTO.setLimit(null);
+              companyPerformanceFindDTO.setPage(null);
               String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
               response.setContentType("application/vnd.ms-excel;charset=utf-8");
               String filename = String.format("%s-company-statistics.xlsx",name);