删除问题fix

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

@@ -97,7 +97,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
                 cartGoods.setOriginalGoodsUid(sendGoods.getOriginalGoodsUid());
                 this.setGiftExtra(cartGoods,product,cartGoodsList);
 
-                CartGoods fatherGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid())).findFirst().orElseGet(null);
+                CartGoods fatherGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid())).findFirst().orElse(null);
                 if (fatherGoods != null){
                     cartGoods.setCartGoodsUid(fatherGoods.getCartGoodsUid());
                 }

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

@@ -1259,7 +1259,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
             if (MapUtils.isNotEmpty(qtyMap)){
                 for (String key : qtyMap.keySet()){
-                    CartGoods cartGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(key)).findFirst().orElseGet(null);
+                    CartGoods cartGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(key)).findFirst().orElse(null);
                     if (cartGoods != null){
                         cartGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
                         cartGoods.setActualQty(cartGoods.getQty());

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

@@ -212,13 +212,13 @@ public class CalculationSharingDiscountService {
             Map<String, Integer> qtyMap = giftSharingService.xPiecesYFoldAdapter(sharingDiscountResponseDto);
             if (MapUtils.isNotEmpty(qtyMap)){
                 for (String key : qtyMap.keySet()){
-                    CartGoods cartGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(key)).findFirst().orElseGet(null);
+                    CartGoods cartGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(key)).findFirst().orElse(null);
                     if (cartGoods != null){
                         cartGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
                         cartGoods.setActualQty(cartGoods.getQty());
                         cartGoods.setQty(qtyMap.get(key));
                         if (ObjectUtils.equals(cartGoods.getQty(), 1)){
-                            CartGoods sendGoods = cartGoodsList.stream().filter(p -> cartGoods.getCartGoodsUid().equals(p.getOriginalGoodsUid())).findFirst().orElseGet(null);
+                            CartGoods sendGoods = cartGoodsList.stream().filter(p -> cartGoods.getCartGoodsUid().equals(p.getOriginalGoodsUid())).findFirst().orElse(null);
                             if (cartGoods != null){
                                 sendGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
                             }