Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group

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

@@ -45,10 +45,7 @@ import cn.freemud.service.impl.calculate.*;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationFactory;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import cn.freemud.service.thirdparty.*;
-import cn.freemud.utils.BeanUtil;
-import cn.freemud.utils.PromotionFactory;
-import cn.freemud.utils.PropertyConvertUtil;
-import cn.freemud.utils.ResponseUtil;
+import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -310,6 +307,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 获取商品详细信息
         List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId
                 , Collections.singletonList(spuId2),addShoppingCartGoodsRequestVo.getMenuType(), this.shoppingCartBaseService);
+        LogUtil.info("productBeanListSpuClass", spuId2,JSON.toJSONString(productBeanListSpuClass));
 
         //缓存中获取购物车商品信息
         // 注意，围餐和点餐redis数据结构不一样

shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java

@@ -282,7 +282,7 @@ public class CouponTest {
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
         for (CartGoods product : shoppingCartGoodsResponseVo.getProducts()) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
-            ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product);
+            ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product,"");
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);
         }
     }
@@ -317,7 +317,7 @@ public class CouponTest {
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
         for (CartGoods product : shoppingCartGoodsResponseVo.getProducts()) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
-            ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product);
+            ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product,"");
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);
         }
         //ShoppingCartInfoRequestVo