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

买赠商品挂靠购物车行逻辑调整

See merge request !58

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

@@ -248,7 +248,7 @@ public class BuySendPromotionService implements IPromotionService {
             }
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getGoodsId());
-        if (cartGood.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid())) {
+        if (!cartGood.getCartGoodsUid().equals(sendGoods.getOriginalGoodsUid())) {
             return;
         }
         String s = currentSubName(cartGood);