Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa

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

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

@@ -248,6 +248,9 @@ public class BuySendPromotionService implements IPromotionService {
             }
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getGoodsId());
+        if (!cartGood.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid())) {
+            return;
+        }
         String s = currentSubName(cartGood);
         CartGoods newCartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
         newCartGoods.setOriginalGoodsUid(sendGoods.getOriginalGoodsUid());