Merge branch 'featur/20210519-加价购优化'

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/ShoppingBaseServiceImpl.java

@@ -72,12 +72,11 @@ public class ShoppingBaseServiceImpl implements ShoppingCartService {
 
     @Override
     public void updateForPopupWindow(BaseListCartGoodsVO baseListCartGoodsVO, Integer showType, List<PremiumExchangeResponseVo.PremiumExchangeProduct> chooseSendGoodList, List<ListCartGoodsBO.SendGoods> sendGoods) {
-        if(Integer.valueOf("5").equals(showType) && !org.springframework.util.CollectionUtils.isEmpty(chooseSendGoodList)){
-            chooseSendGoodList.forEach(good->{
-                ListCartGoodsBO.SendGoods first =null;
-                if(sendGoods !=null) {
-                    first = sendGoods.stream().filter(a -> a.getGoodsId().equals(good.getPid())).findFirst().orElseGet(null);
-                }
+        if (Integer.valueOf("5").equals(showType) && !org.springframework.util.CollectionUtils.isEmpty(chooseSendGoodList)) {
+            chooseSendGoodList.forEach(good -> {
+                ListCartGoodsBO.SendGoods first = null;
+                first = sendGoods.stream().filter(a -> a.getGoodsId().equals(good.getSkuId()) || a.getGoodsId().equals(good.getSpuId())).findFirst().orElse(null);
+                if (first == null) return;
                 CartGoods cartGoods = new CartGoods();
                 cartGoods.setSpuId(good.getSpuId());
                 cartGoods.setSkuId(good.getSkuId());
@@ -90,19 +89,17 @@ public class ShoppingBaseServiceImpl implements ShoppingCartService {
                 cartGoods.setGoodsId(good.getPid());
                 cartGoods.setName(good.getName());
                 cartGoods.setSpuName(good.getSpuName());
-                cartGoods.setQty(first==null ? 1:first.getQty());
-                if(first != null) {
-                    cartGoods.setActivityCode(first.getActivityCode());
-                    if(!CollectionUtils.isEmpty(first.getAttributes())){
-                        List<CartGoods.CartGoodsExtra> extra = new ArrayList();
-                        first.getAttributes().forEach(attribute -> {
-                            CartGoods.CartGoodsExtra goodsExtra = new CartGoods.CartGoodsExtra();
-                            goodsExtra.setAttributeId(attribute.getAttributeId());
-                            goodsExtra.setAttributeName(attribute.getAttributeValue());
-                            extra.add(goodsExtra);
-                        });
-                        cartGoods.setExtra(extra);
-                    }
+                cartGoods.setQty(first == null ? 1 : first.getQty());
+                cartGoods.setActivityCode(first.getActivityCode());
+                if (!CollectionUtils.isEmpty(first.getAttributes())) {
+                    List<CartGoods.CartGoodsExtra> extra = new ArrayList();
+                    first.getAttributes().forEach(attribute -> {
+                        CartGoods.CartGoodsExtra goodsExtra = new CartGoods.CartGoodsExtra();
+                        goodsExtra.setAttributeId(attribute.getAttributeId());
+                        goodsExtra.setAttributeName(attribute.getAttributeValue());
+                        extra.add(goodsExtra);
+                    });
+                    cartGoods.setExtra(extra);
                 }
                 baseListCartGoodsVO.getProducts().add(cartGoods);
             });

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -786,10 +786,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                                      List<ShoppingCartInfoRequestVo.SendGoods> sendGoods) {
         if(Integer.valueOf("5").equals(showType) && !org.springframework.util.CollectionUtils.isEmpty(chooseSendGoodList)){
             chooseSendGoodList.forEach(good->{
-                ShoppingCartInfoRequestVo.SendGoods first =null;
-                if (sendGoods != null) {
-                    first = sendGoods.stream().filter(a -> a.getGoodsId().equals(good.getPid())).findFirst().orElseGet(null);
-                }
+                ShoppingCartInfoRequestVo.SendGoods first = null;
+                first = sendGoods.stream().filter(a -> a.getGoodsId().equals(good.getSkuId()) || a.getGoodsId().equals(good.getSpuId())).findFirst().orElse(null);
+                if (first == null) return;
                 CartGoods cartGoods = new CartGoods();
                 cartGoods.setSpuId(good.getSpuId());
                 cartGoods.setSkuId(good.getSkuId());
@@ -802,19 +801,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 cartGoods.setGoodsId(good.getPid());
                 cartGoods.setName(good.getName());
                 cartGoods.setSpuName(good.getSpuName());
-                cartGoods.setQty(first==null ? 1:first.getQty());
-                if(first != null) {
-                    cartGoods.setActivityCode(first.getActivityCode());
-                    if(!CollectionUtils.isEmpty(first.getAttributes())){
-                        List<CartGoods.CartGoodsExtra> extra = new  ArrayList();
-                        first.getAttributes().forEach(attribute -> {
-                            CartGoods.CartGoodsExtra goodsExtra = new CartGoods.CartGoodsExtra();
-                            goodsExtra.setAttributeId(attribute.getAttributeId());
-                            goodsExtra.setAttributeName(attribute.getAttributeValue());
-                            extra.add(goodsExtra);
-                        });
-                        cartGoods.setExtra(extra);
-                    }
+                cartGoods.setQty(first == null ? 1 : first.getQty());
+                cartGoods.setActivityCode(first.getActivityCode());
+                if (!CollectionUtils.isEmpty(first.getAttributes())) {
+                    List<CartGoods.CartGoodsExtra> extra = new ArrayList();
+                    first.getAttributes().forEach(attribute -> {
+                        CartGoods.CartGoodsExtra goodsExtra = new CartGoods.CartGoodsExtra();
+                        goodsExtra.setAttributeId(attribute.getAttributeId());
+                        goodsExtra.setAttributeName(attribute.getAttributeValue());
+                        extra.add(goodsExtra);
+                    });
+                    cartGoods.setExtra(extra);
                 }
                 shoppingCartGoodsResponseVo.getProducts().add(cartGoods);
             });