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

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

@@ -100,6 +100,9 @@ public class CalculationCommonService {
         }
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(discountResult == null ? totalOriginalAmount : discountResult.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(discountResult == null ? totalAmount : discountResult.getTotalAmount());
+        // fisherman 目前需求: 是否满足配送 按照商品原价|现价匹配
+        shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsResponseVo.getTotalAmount());
+        shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
         //fisherman 【ID1033456】自提根据模板配置计算餐具包装费 新算价一起处理
         shoppingCartGoodsResponseVo.setNewPackAmount(commonFunctionHandle.getPackAmountByStoreConfig(shoppingCartInfoRequestVo,totalPackageAmount));
         // fisehrman 总优惠金额 需要+配送券的优惠金额