Merge branch 'feature/20201204-1.0.10-加赠商品修改由行记录判断-lcf' into qa

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

@@ -346,6 +346,10 @@ public class ActivityCalculationDiscountResponseDto {
             @Data
             public static class SendGoods {
                 /**
+                 * 买一赠一时，存赠送主商品的cartGoodsUid 用于标记是那个商品送的
+                 */
+                private String originalGoodsUid;
+                /**
                  * 赠送商品ID
                  */
                 private String goodsId;

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

@@ -237,13 +237,12 @@ public class BuySendPromotionService implements IPromotionService {
         }
         if (manyOrSingle) {
             // 多规格
-            if (!Objects.equals(sendGoodsMap.get(cartGood.getSkuId()).getGoodsId(), cartGood.getSkuId())) {
+            if (!Objects.equals(sendGoodsMap.get(cartGood.getSkuId()).getOriginalGoodsUid(), cartGood.getCartGoodsUid())) {
                 return;
             }
         } else {
             // 单品
-            List<String> spuIds = newCartGoodsList.stream().map(CartGoods::getSpuId).collect(Collectors.toList());
-            if (spuIds.contains(cartGood.getSpuId())) {
+            if (!Objects.equals(sendGoodsMap.get(cartGood.getSpuId()).getOriginalGoodsUid(), cartGood.getCartGoodsUid())) {
                 return;
             }
         }