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/adapter/ShoppingCartConvertAdapter.java

@@ -928,10 +928,10 @@ public class ShoppingCartConvertAdapter {
                     for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail){
                         if(groupDetailType.getProductId().equals(productMaterial.getSpuId())){
                             productMaterial.setSpuId(groupDetailType.getProductId());
-                            productMaterial.setAmount(groupDetailType.getProductPrice().longValue());
+                            productMaterial.setAmount(groupDetailType.getProductFinalPrice().longValue());
                             productMaterial.setFinalPrice(groupDetailType.getProductFinalPrice().longValue());
-                            productMaterial.setOriginalAmount(groupDetailType.getProductPrice().longValue());
-                            productMaterial.setOriginalPrice(groupDetailType.getProductPrice().longValue());
+                            productMaterial.setOriginalAmount(groupDetailType.getProductFinalPrice().longValue());
+                            productMaterial.setOriginalPrice(groupDetailType.getProductFinalPrice().longValue());
                             productMaterial.setSpuName(groupDetailType.getProductName());
                         }
                     }