Merge branch 'ww' into test

2024-09-13 16:02:26 +08:00
parent 21d35b3f22 12c8894436
commit 271b0f110f
3 changed files with 18 additions and 2 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -389,7 +389,7 @@ public class ProductService {
     */
    public List<TbProduct> handleDate(List<TbProduct> products,boolean check,Integer isSale,boolean isVip){
        if (!CollectionUtils.isEmpty(products)) {
-            products.parallelStream().forEach(it -> {
+            products.forEach(it -> {
                if(check){
                    List<TbProductGroup> tbProductGroups = tbProductGroupMapper.selectByProductId(it.getShopId(), it.getId().toString());
                    for (TbProductGroup g : tbProductGroups) {