Merge branch 'feature-yu.sun-material-20201030' into qa

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

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

@@ -823,7 +823,10 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setQty(orderItem.getProductQuantity());
             cartGoods.setSpuId(orderItem.getProductId());
             cartGoods.setSkuId(orderItem.getProductSpec());
+            cartGoods.setOriginalPrice(orderItem.getProductPrice().longValue());
             cartGoods.setFinalPrice(orderItem.getProductPrice().longValue());
+            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
+            cartGoods.setAmount(cartGoods.getFinalPrice() * cartGoods.getQty());
             cartGoods.setPic(orderItem.getProductPicUrl());
             if(6 == orderItem.getProductType()) {
                 cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
@@ -881,8 +884,9 @@ public class ShoppingCartMCoffeeServiceImpl {
         comboxGoods.setSpuName(StringUtils.isNotEmpty(orderItemResp.getProductName()) ? orderItemResp.getProductName() :"");
         comboxGoods.setSkuName(StringUtils.isNotEmpty(orderItemResp.getProductSpecName()) ? orderItemResp.getProductSpecName() :"");
         comboxGoods.setSubName(StringUtils.isNotEmpty(orderItemResp.getProductSpecName()) ? orderItemResp.getProductSpecName() : "");
-
-        if (!"".equals(orderItemResp.getProductProperty())) {
+        comboxGoods.setOriginalAmount(comboxGoods.getOriginalPrice() * comboxGoods.getQty());
+        comboxGoods.setAmount(comboxGoods.getFinalPrice() * comboxGoods.getQty());
+        if (StringUtils.isNotBlank(orderItemResp.getProductProperty())) {
             List<CartGoods.CartGoodsExtra> extra = new ArrayList<>();
             String[] split = orderItemResp.getProductProperty().split("/");
             for (int i = 0; i < split.length; i++) {
@@ -917,6 +921,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         materialGoods.setCustomerCode(orderItemResp.getThirdProductId());
         materialGoods.setFinalPrice(orderItemResp.getSalePrice().longValue());
         materialGoods.setOriginalPrice(orderItemResp.getProductPrice().longValue());
+        materialGoods.setOriginalAmount(materialGoods.getOriginalPrice());
+        materialGoods.setAmount(materialGoods.getFinalPrice());
         materialGoods.setSpuName(orderItemResp.getProductName());
         cartGoods.getProductMaterialList().add(materialGoods);
         return materialGoods;
@@ -929,6 +935,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         materialGoods.setCustomerCode(orderItemResp.getThirdProductId());
         materialGoods.setFinalPrice(orderItemResp.getSalePrice().longValue());
         materialGoods.setOriginalPrice(orderItemResp.getProductPrice().longValue());
+        materialGoods.setOriginalAmount(materialGoods.getOriginalPrice());
+        materialGoods.setAmount(materialGoods.getFinalPrice());
         materialGoods.setSpuName(orderItemResp.getProductName());
         comboGoods.getProductMaterialList().add(materialGoods);
         return materialGoods;