对接促销算价Alpha->fix

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -161,7 +161,7 @@ public class CalculationCommonService {
      */
     public ShoppingCartGoodsDto.CartGoodsDetailDto convertCartGoods2DetailGoodsList(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods calculationGoods
             , CartGoods cartGoods) {
-        log.info("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
+        log.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(calculationGoods, cartGoods);
         return cartGoodsDetailDto;
     }
@@ -393,6 +393,7 @@ public class CalculationCommonService {
             HashMap<String, BlockRow> gxDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, true);
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true);
             combs.addAll(comboLists);
+            cartGoodsDetailDto.setProductType(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
         }
         /**
          * 可选商品