删除问题fix

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

@@ -96,6 +96,11 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
                 cartGoods.setNodeId(sendActivity.getActivityCode());
                 cartGoods.setOriginalGoodsUid(sendGoods.getOriginalGoodsUid());
                 this.setGiftExtra(cartGoods,product,cartGoodsList);
+
+                CartGoods fatherGoods = cartGoodsList.stream().filter(p -> p.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid())).findFirst().orElseGet(null);
+                if (fatherGoods != null){
+                    cartGoods.setCartGoodsUid(fatherGoods.getCartGoodsUid());
+                }
                 cartGoodsList.add(cartGoods);
                 totalGiftAmount += product.getFinalPrice() * sendGoods.getSendNumber();
             }

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

@@ -29,6 +29,7 @@ import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -216,6 +217,12 @@ public class CalculationSharingDiscountService {
                         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);
+                            if (cartGoods != null){
+                                sendGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
+                            }
+                        }
                     }
                 }
             }

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

@@ -145,6 +145,7 @@ public class GiftSharingService {
                 sendGoods.setGoodsQuantity(discount.getActualGoodsNumber());
                 sendGoods.setOriginalPrice(discount.getSignleDiscount());
                 sendGoods.setDiscountAmount(discount.getDiscount());
+                sendGoods.setOriginalGoodsUid(goods.getCartGoodsUid());
                 sendGoods.setRealAmount(0L);
 
                 List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> goodsDiscounts = new ArrayList<>();