Commit 723a9004 by 周晓航

Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa

parents 1a4e62a3 f006ecc1
...@@ -80,6 +80,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; ...@@ -80,6 +80,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest; import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService; import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl; import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import javafx.util.Pair; import javafx.util.Pair;
import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFacade;
...@@ -1172,7 +1173,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1172,7 +1173,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
} }
// fisherman 设置 商品的 productType 和商品的类型同步 // fisherman 设置 商品的 productType 和商品的类型同步
List<ProductBeanDTO> productList = checkCartRequest.getProductList(); List<ProductBeanDTO> productList = checkCartRequest.getProductList();
ApiLog.printLog("fisherman 购物车均摊",JSON.toJSONString(productList), ShoppingSdkLogUtil.infoLog("fisherman 购物车均摊",JSON.toJSONString(productList),
JSON.toJSONString(shoppingCartGoodsDto.getProducts()), JSON.toJSONString(shoppingCartGoodsDto.getProducts()),
JSON.toJSONString(premiumExchangeActivity)); JSON.toJSONString(premiumExchangeActivity));
if (CollectionUtils.isNotEmpty(productList)) { if (CollectionUtils.isNotEmpty(productList)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment