删除问题fix

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

@@ -23,6 +23,7 @@ import cn.freemud.service.active.ActiveService;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -95,6 +96,9 @@ public class PlatformActiveServiceImpl implements ActiveService {
                     .get();
             CartGoods cartGood = new CartGoods();
             cartGood.setGoodsId(goods.getGoodsId());
+            if (StringUtils.isNotBlank(goods.getCartGoodsUid()) && ActivityTypeEnum.TYPE_1040.getCode().equals(discount.getType())){
+                cartGood.setCartGoodsUid(goods.getCartGoodsUid());
+            }
             cartGood.setGoodsType(1);
             cartGood.setSpuId(goods.getGoodsId());
             cartGood.setSkuId(goods.getGoodsId());

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()) && ObjectUtils.equals(p.getQty(), 1)).findFirst().orElse(null);
+                CartGoods fatherGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid()) && ObjectUtils.equals(p.getQty(), 0)).findFirst().orElse(null);
                 if (fatherGoods != null){
                     cartGoods.setCartGoodsUid(fatherGoods.getCartGoodsUid());
                 }

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

@@ -217,12 +217,14 @@ public class CalculationSharingDiscountService {
                         cartGoods.setActivityType(ActivityTypeEnum.TYPE_104.getCode());
                         cartGoods.setActualQty(cartGoods.getQty());
                         cartGoods.setQty(qtyMap.get(key));
+
                         if (ObjectUtils.equals(cartGoods.getQty(), 0)){
-                            CartGoods sendGoods = cartGoodsList.stream().filter(p -> cartGoods.getCartGoodsUid().equals(p.getOriginalGoodsUid())).findFirst().orElse(null);
-                            if (cartGoods != null){
-                                sendGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
+                            CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods = sharingDiscountResponseDto.getResult().getGoods().stream().filter(p -> cartGoods.getCartGoodsUid().equals(p.getOriginalGoodsUid())).findFirst().orElse(null);
+                            if (goods != null){
+                                goods.setCartGoodsUid(cartGoods.getCartGoodsUid());
                             }
                         }
+
                     }
                 }
             }

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

@@ -94,7 +94,7 @@ public class GiftSharingService {
                 List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList = new ArrayList<>();
                 ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoodsInfo = new ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods();
                 sendGoodsInfo.setGoodsId(discount.getGoodsId());
-                sendGoodsInfo.setOriginalGoodsUid(goods.getOriginalGoodsUid());
+                sendGoodsInfo.setOriginalGoodsUid(goods.getCartGoodsUid());
                 sendGoodsInfo.setSendNumber(discount.getActualGoodsNumber());
                 sendGoodsList.add(sendGoodsInfo);
                 sendGoods.setSendGoods(sendGoodsList);