Merge remote-tracking branch 'origin/zx_1026_1111' into zx_1026_1111

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -171,19 +171,19 @@ public class OpenDouble11StaticsController extends BaseController {
             });
         }
 
-        Double11StaticWrapper.SaleAmountAndUser total = new Double11StaticWrapper.SaleAmountAndUser();
-        total.setOrganName("总部");
-        double acAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getActualAmount)
-                .mapToDouble(BigDecimal::doubleValue).sum();
-        total.setActualAmount(new BigDecimal(acAmount));
-        double baAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getBalancePaymentAmount)
-                .mapToDouble(BigDecimal::doubleValue).sum();
-        total.setBalancePaymentAmount(new BigDecimal(baAmount));
-        int totalUser = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getUserPurchaseNumber)
-                .mapToInt(Integer::intValue).sum();
-        total.setUserPurchaseNumber(totalUser);
-
-        result.add(0, total);
+//        Double11StaticWrapper.SaleAmountAndUser total = new Double11StaticWrapper.SaleAmountAndUser();
+//        total.setOrganName("总部");
+//        double acAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getActualAmount)
+//                .mapToDouble(BigDecimal::doubleValue).sum();
+//        total.setActualAmount(new BigDecimal(acAmount));
+//        double baAmount = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getBalancePaymentAmount)
+//                .mapToDouble(BigDecimal::doubleValue).sum();
+//        total.setBalancePaymentAmount(new BigDecimal(baAmount));
+//        int totalUser = result.stream().map(Double11StaticWrapper.SaleAmountAndUser::getUserPurchaseNumber)
+//                .mapToInt(Integer::intValue).sum();
+//        total.setUserPurchaseNumber(totalUser);
+//
+//        result.add(0, total);
         return R.from(result);
     }