功能提交 订单财务列表 增加面额和利润

modules/admin/src/main/java/com/fire/admin/service/OrderManagementService.java

@@ -300,6 +300,7 @@ public class OrderManagementService {
         SumAggregationBuilder sumBuilder = AggregationBuilders.sum("sumPrice").field("price");
         SumAggregationBuilder sumBuilder2 = AggregationBuilders.sum("sumPartnerPrice").field("partnerBalancePrice");
         SumAggregationBuilder sumBuilder3 = AggregationBuilders.sum("sumOperatorPrice").field("operatorBalancePrice");
+        SumAggregationBuilder sumBuilder4 = AggregationBuilders.sum("sumFlowAmount").field("flowAmount");
 
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withPageable(pageable)
@@ -309,6 +310,7 @@ public class OrderManagementService {
                 .build();
         query.addAggregation(sumBuilder2);
         query.addAggregation(sumBuilder3);
+        query.addAggregation(sumBuilder4);
         //查询数据
         try {
             SearchHits<OrderEsDto> hits = restTemplate.search(query, OrderEsDto.class);
@@ -316,7 +318,7 @@ public class OrderManagementService {
             double sumPrice = ((ParsedSum) aggregations.get("sumPrice")).getValue();
             double sumPartnerPrice = ((ParsedSum) aggregations.get("sumPartnerPrice")).getValue();
             double sumOperatorPrice = ((ParsedSum) aggregations.get("sumOperatorPrice")).getValue();
-
+            double sumFlowAmount = ((ParsedSum) aggregations.get("sumFlowAmount")).getValue();
             long total = hits.getTotalHits();
             List<SearchHit<OrderEsDto>> searchHits = hits.getSearchHits();
             System.out.println("一共" + total + "个");
@@ -325,9 +327,12 @@ public class OrderManagementService {
                 OrderEsDto orderEsDto = searchHit.getContent();
                 resultsList.add(orderEsDto);
             }
+
             pageMap.put("sumPrice", sumPrice);
             pageMap.put("sumPartnerPrice", sumPartnerPrice);
             pageMap.put("sumOperatorPrice", sumOperatorPrice);
+            pageMap.put("sumFlowAmount", sumFlowAmount);
+            pageMap.put("sumProfit", sumPrice - sumPartnerPrice - sumOperatorPrice);
             pageMap.put("records", resultsList);
             pageMap.put("size", size);
             pageMap.put("current", page + 1);