Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa'

包装费透传问题

See merge request !75

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

@@ -722,7 +722,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         if (shoppingCartGoodsResponseVo != null && shoppingCartGoodsResponseVo.getProducts() != null && shoppingCartGoodsDto != null && shoppingCartGoodsDto.getProducts() != null) {
             shoppingCartGoodsResponseVo.getProducts().stream().forEach(product -> {
                 shoppingCartGoodsDto.getProducts().stream().forEach(goods -> {
-                    if (goods.getCartGoodsUid().equals(product.getCartGoodsUid()) && goods.getOriginalPrice().equals(product.getOriginalAmount())) {
+                    if (goods.getCartGoodsUid().equals(product.getCartGoodsUid())) {
                         goods.setPackPrice(product.getPackPrice());
                     }
                 });