Commit 2053c3a7 by 徐康

问题修复

parent 21c1b6a5
...@@ -118,7 +118,7 @@ public class AssortmentSdkService { ...@@ -118,7 +118,7 @@ public class AssortmentSdkService {
public List<CartGoods> getShoppingCartSendGoods(String partnerId, String storeId, String useId, String sessionId, String tableNumber, ShoppingCartBaseService shoppingCartService) { public List<CartGoods> getShoppingCartSendGoods(String partnerId, String storeId, String useId, String sessionId, String tableNumber, ShoppingCartBaseService shoppingCartService) {
int buyType = 0 ; int buyType = 0 ;
return getNowBuyShoppingCart( buyType, partnerId, storeId, useId, sessionId, tableNumber, shoppingCartService); return getNowBuyShoppingCartSendGoods( buyType, partnerId, storeId, useId, sessionId, tableNumber, shoppingCartService);
} }
/** /**
...@@ -375,7 +375,7 @@ public class AssortmentSdkService { ...@@ -375,7 +375,7 @@ public class AssortmentSdkService {
cartParamDto.setBuyType(buyType); cartParamDto.setBuyType(buyType);
} }
// 根据不同点餐类型获取不同购物车实例 // 根据不同点餐类型获取不同购物车实例
BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.getCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo()); BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.getCartSendGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) { if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
return new ArrayList<>(); return new ArrayList<>();
} }
......
...@@ -701,7 +701,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -701,7 +701,7 @@ public class ShoppingCartMCoffeeServiceImpl {
ApiLog.debug("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList)); ApiLog.debug("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService); List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
ApiLog.debug("cartSendGoodsList: {}",JSONObject.toJSONString(cartGoodsList)); ApiLog.debug("cartSendGoodsList: {}",JSONObject.toJSONString(cartSendGoodsList));
CartGoods monthCardProduct = null; CartGoods monthCardProduct = null;
// 如果购物车商品不为空, 则check购物车中所有商品 // 如果购物车商品不为空, 则check购物车中所有商品
if (CollectionUtils.isNotEmpty(cartGoodsList)) { if (CollectionUtils.isNotEmpty(cartGoodsList)) {
......
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