From 02453df49a23e347692af7d51ea993cef6578e68 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 13 Jun 2025 18:25:06 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=B8=82=E5=9C=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81-=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retail/member/utils/DataStatisticsUtil.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
index 5de773cb..8539d1dd 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
@@ -83,7 +83,7 @@ public class DataStatisticsUtil {
      * @param detailVOList
      */
     public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
-        detailVOList.parallelStream().forEach(detailVO -> {
+        detailVOList.stream().forEach(detailVO -> {
             detailVO.setTotalBoxNum(
                     detailVO.getConsumeBoxNum()         // 个人累计消费盒数(日结)
 //                     + detailVO.getNewBoxNum()          // 个人新增盒数(日结)
@@ -110,7 +110,7 @@ public class DataStatisticsUtil {
      * @param detailVOList
      */
     public static void excludeDailySettlementData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList){
-        detailVOList.parallelStream().forEach(detailVO -> {
+        detailVOList.stream().forEach(detailVO -> {
             detailVO.setTotalBoxNum(
                     detailVO.getTotalBoxNum()
                     - detailVO.getTeamBoxNum()          // 团队累计消费盒数(日结)
@@ -127,7 +127,7 @@ public class DataStatisticsUtil {
      * @param detailVOList
      */
     public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
-        detailVOList.parallelStream().forEach(detailVO -> {
+        detailVOList.stream().forEach(detailVO -> {
             if(!detailVO.getPkId().equals(pkId)){
                 detailVO.setTotalBoxNum(
                         detailVO.getTotalBoxNum()
@@ -220,7 +220,7 @@ public class DataStatisticsUtil {
      * @return
      */
     public static CuMemberRetailDataStatisticsDetailVO getDetailVOByPKID(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
-        return detailVOList.parallelStream().filter(o -> o.getPkId().equals(pkId)).findFirst().orElse(null);
+        return detailVOList.stream().filter(o -> o.getPkId().equals(pkId)).findFirst().orElse(null);
     }
 
     /**
@@ -229,19 +229,19 @@ public class DataStatisticsUtil {
      */
     public static PageResult<MarketDynamicsDetailVO> getMarketDynamicsAssemblyData(List<MarketDynamicsDetailVO> detailVOList, MarketDynamicsQueryDateParam param){
         if(StrUtil.isNotEmpty(param.getKeyWords())){
-            detailVOList = detailVOList.parallelStream().filter(o -> param.getKeyWords().contains(o.getMemberCode()) || param.getKeyWords().contains(o.getMemberName())).collect(Collectors.toList());
+            detailVOList = detailVOList.stream().filter(o -> o.getMemberCode().contains(param.getKeyWords()) || o.getMemberName().contains(param.getKeyWords())).collect(Collectors.toList());
         }
-        MarketDynamicsDetailVO bigRange = detailVOList.parallelStream()
+        MarketDynamicsDetailVO bigRange = detailVOList.stream()
                 .max(Comparator.comparingInt(MarketDynamicsDetailVO::getTotalBoxNum))
                 .orElse(null);
-        detailVOList = detailVOList.parallelStream().filter(o -> !o.getPkId().equals(bigRange.getPkId())).collect(Collectors.toList());
+        detailVOList = detailVOList.stream().filter(o -> !o.getPkId().equals(bigRange.getPkId())).collect(Collectors.toList());
         PageResult<MarketDynamicsDetailVO> result = MemoryPageUtils.paginate(detailVOList, param.getPageNum(), param.getPageSize());
         result.setBigRange(bigRange);
         return result;
     }
 
     private static Integer getMaxTotalBoxNum(List<CuMemberRetailDataStatisticsDetailVO> detailVOList) {
-        return detailVOList.parallelStream()
+        return detailVOList.stream()
                 .map(CuMemberRetailDataStatisticsDetailVO::getTotalBoxNum)
                 .filter(Objects::nonNull)
                 .max(Integer::compare)