Merge branches 'feature-yu.sun-material-20201030' and 'qa' of…

Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -426,7 +426,7 @@ public class CalculationServiceImpl {
                         ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                         material.setType(1);
                         material.setGoodsId(materialGoods2.getSpuId());
-                        material.setGoodsQuantity(cartGoods.getQty());
+                        material.setGoodsQuantity(1);
                         material.setOriginalPrice(materialGoods2.getFinalPrice());
                         materials.add(material);
                     }
@@ -440,7 +440,7 @@ public class CalculationServiceImpl {
                 ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(1);
                 material.setGoodsId(materialGoods.getSpuId());
-                material.setGoodsQuantity(cartGoods.getQty());
+                material.setGoodsQuantity(1);
                 material.setOriginalPrice(materialGoods.getOriginalPrice());
                 material.setNowPrice(materialGoods.getFinalPrice().intValue());
                 materials.add(material);