Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -980,8 +980,8 @@ public class ShoppingCartConvertAdapter {
                             }
                         }else {
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
-                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
+//                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
+                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
                             }
                         }
                     }

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java

@@ -237,6 +237,19 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 product.setFinalPrice(goodsDiscountsMap.get(product.getCartGoodsUid()).getNowPrice());
             }
 
+            // 小料信息
+            if(goodsDiscountsMap.get(product.getCartGoodsUid()) == null){
+                continue;
+            }
+            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial = goodsDiscountsMap.get(product.getCartGoodsUid()).getSmallMaterial();
+            Integer smallMaterialTotal = 0;
+            for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial sm : smallMaterial){
+                smallMaterialTotal = smallMaterialTotal + sm.getOriginalPrice();
+            }
+
+            // 商品的单价 = 商品单价+小料单价
+            product.setOriginalPrice(new Long(smallMaterialTotal));
+
             newProducts.add(product);
         }
         shoppingCartGoodsResponseVo.setProducts(newProducts);
@@ -314,6 +327,20 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     product.setGoodsId(null);
                 }
 
+                // 小料信息
+                if(goodsDiscountsMap.get(product.getCartGoodsUid()) == null){
+                    continue;
+                }
+                List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial = goodsDiscountsMap.get(product.getCartGoodsUid()).getSmallMaterial();
+                Integer smallMaterialTotal = 0;
+                for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial sm : smallMaterial){
+                    smallMaterialTotal = smallMaterialTotal + sm.getOriginalPrice();
+                }
+
+                // 商品的单价 = 商品单价+小料单价
+                product.setOriginalPrice(new Long(smallMaterialTotal));
+                // 商品现单价=商品现单价+小料现单价
+                //product.setFinalPrice();
 
                 newProducts.add(product);
             }