Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa

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

@@ -837,14 +837,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
         }
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
-        shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
-        shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(0L);
-        if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())) {
-            long shoppingCartGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getAmount).sum();
-            shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsAmount);
-            long shoppingCartOriginalGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getOriginalAmount).sum();
-            shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartOriginalGoodsAmount);
-        }
+//        shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
+//        if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())) {
+//            long shoppingCartGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getAmount).sum();
+//            shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsAmount);
+//        }
 
         if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getSendGoods())) {
             PremiumExchangeRequestVo request = new PremiumExchangeRequestVo();
@@ -2319,6 +2316,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (Objects.isNull(shoppingCartInfoRequestVo)) {
             return;
         }
+        // 这两行为了 展示 商品的 原价以及现在的购买价格 不需要包装费, fisherman 目前需求: 是否满足配送 按照商品原价|现价匹配
+        shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsResponseVo.getTotalAmount());
+        shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
         // 到店自取包装费设为null,外卖要计算包装费，flag为1表示去结算
         // 兼容老版本判断null
         if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())