update:购物车直接删除异常商品

fengliang
1 parent ee659743
Showing 1 changed file with 12 additions and 4 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
 package com.diligrp.etrade.order.service.impl;
 import com.diligrp.etrade.core.domain.Message;
-import com.diligrp.etrade.core.type.SaleUnitType;
 import com.diligrp.etrade.core.util.AssertUtils;
 import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.core.util.MoneyUtil;
@@ -14,7 +13,6 @@ import com.diligrp.etrade.order.model.ShopCart;
 import com.diligrp.etrade.order.model.ShopCartMessage;
 import com.diligrp.etrade.order.service.IShopCartMessageService;
 import com.diligrp.etrade.order.service.IShopCartService;
-import com.diligrp.etrade.order.type.ProductTradeType;
 import com.diligrp.etrade.order.type.ShopCartMessageCheckFlag;
 import com.diligrp.etrade.order.type.ShopCartMessageProductState;
 import com.diligrp.etrade.shop.domain.response.ProductDetailVo;
@@ -111,6 +109,8 @@ public class ShopCartImpl implements IShopCartService {
             //封装商品预设信息productPresetMap
             productPresetMap.put(productListVo.getId(), map);
         }
+        ShopCartDto deleteCartDto = new ShopCartDto();
+        List<Long> deleteIds = new ArrayList<>();
         //组装数据
         shopCartVos.forEach(shopCartVo -> {
@@ -151,11 +151,19 @@ public class ShopCartImpl implements IShopCartService {
                 }
             });
             //对购物车商品信息集合按修改时间倒序排序
-            List<ShopCartMessageVo> shopCartMessageVos = shopCartMessageVoList.stream().sorted(Comparator.comparing(ShopCartMessageVo::getCreatedTime, Comparator.reverseOrder())).collect(Collectors.toList());
+            List<ShopCartMessageVo> shopCartMessageVos = shopCartMessageVoList.stream().filter(en->en.getProductState().equals(ShopCartMessageProductState.NORMAL.getCodeInteger())).sorted(Comparator.comparing(ShopCartMessageVo::getCreatedTime, Comparator.reverseOrder())).collect(Collectors.toList());
             shopCartVo.setShopCartMessageVoList(shopCartMessageVos);
+            List<Long> collect = shopCartMessageVoList.stream().filter(en -> !en.getProductState().equals(ShopCartMessageProductState.NORMAL.getCodeInteger())).map(ShopCartMessageVo::getId).collect(Collectors.toList());
+            if(collect!=null&&collect.size()>0){
+                deleteIds.addAll(collect);
+            }
         });
+        deleteCartDto.setIds(deleteIds);
+        if(deleteIds.size()>0){
+            deleteShopCartMessageList(deleteCartDto);
+        }
         //对购物车集合按修改时间倒序排序
-        return shopCartVos.stream().sorted(Comparator.comparing(ShopCartVo::getModifiedTime, Comparator.reverseOrder())).collect(Collectors.toList());
+        return shopCartVos.stream().filter(en->en.getShopCartMessageVoList().size()>0).sorted(Comparator.comparing(ShopCartVo::getModifiedTime, Comparator.reverseOrder())).collect(Collectors.toList());
     }
     /**