经营报表修改

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderDetailServiceImpl.java

@@ -1,11 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.dao.*;
@@ -145,6 +141,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     addGoodies.add(goods);
                 }
             }
+            if (addGoodies.size() > 0) {
+                goodies.addAll(addGoodies);
+            }
         }
 
         if (StringUtils.isNotBlank(originalGoodsIds)) {
@@ -158,11 +157,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 }
             }
         }
-        while (goodies.iterator().hasNext()) {
-            if (goodies.iterator().next().getSellCount() <= 0) {
-                goodies.iterator().remove();
-            }
-        }
+        goodies.removeIf(goods -> goods.getSellCount() <= 0);
         return goodies;
     }