Merge branch 'feature/20201022_入机键位修改_xukang' into 2020/10/29-fabu-huiyang

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

@@ -883,8 +883,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         Map<String, Object> map = JSONObject.parseObject(orderItemResp.getExtInfo(), Map.class);
         if (map.containsKey("isFixedProduct") && (boolean) map.get("isFixedProduct")) {
             cartGoods.getProductComboList().add(comboxGoods);
-            cartGoods.setFinalPrice(comboxGoods.getFinalPrice());
-            cartGoods.setOriginalPrice(comboxGoods.getOriginalPrice());
         }
         if (map.containsKey("isFixedProduct") && !(boolean) map.get("isFixedProduct")) {
             cartGoods.getProductGroupList().add(comboxGoods);