Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -139,6 +139,12 @@ public class ShoppingCartGoodsDto {
          * 购物车行uid
          */
         private String cartGoodsUid;
+
+        /**
+         * 拼单买一赠一标记赠品是那个商品送的 originalGoodsUid
+         */
+        private String originalGoodsUid;
+
         /**
          * spuId
          */

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

@@ -175,6 +175,7 @@ public class GiftSharingService {
                 CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods = discountForGift.get(k);
                 CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = this.discountInfo(goods);
                 ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
+                cartGoodsDetailDto.setOriginalGoodsUid(goods.getOriginalGoodsUid());
                 cartGoodsDetailDto.setCartGoodsUid(goods.getCartGoodsUid());
                 cartGoodsDetailDto.setTaxId(product.getTaxId());
                 cartGoodsDetailDto.setTax(product.getTax());