Skip to content

O
order-group
Commit c602d582 by 徐康
Options

Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa

parents 80c5d8b3 904c22cf
Showing with 2 additions and 2 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -292,7 +292,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -292,7 +292,7 @@ public class ShoppingCartMCoffeeServiceImpl {
if(activityListOptional.isPresent()) { if(activityListOptional.isPresent()) {
List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService); List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
if(CollectionUtils.isEmpty(cartSendGoodsList) if(CollectionUtils.isEmpty(cartSendGoodsList)
|| activityListOptional.get().getMcCafeSendGoodsList().stream().noneMatch(o-> o.getSkuId().equals(cartSendGoodsList.get(0).getSkuId()))) { || activityListOptional.get().getMcCafeSendGoodsList().stream().noneMatch(o-> o.getGoodsId().equals(cartSendGoodsList.get(0).getSkuId()))) {
MCoffeeAddGoodsRequestVo selectGoodsRequest = new MCoffeeAddGoodsRequestVo(); MCoffeeAddGoodsRequestVo selectGoodsRequest = new MCoffeeAddGoodsRequestVo();
BeanUtils.copyProperties(addShoppingCartGoodsRequestVo, selectGoodsRequest); BeanUtils.copyProperties(addShoppingCartGoodsRequestVo, selectGoodsRequest);
selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId()); selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
...@@ -931,7 +931,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -931,7 +931,7 @@ public class ShoppingCartMCoffeeServiceImpl {
List<CartGoods> finalCartSendGoodsList = new ArrayList<>(); List<CartGoods> finalCartSendGoodsList = new ArrayList<>();
finalCartSendGoodsList.addAll(cartSendGoodsList); finalCartSendGoodsList.addAll(cartSendGoodsList);
if(CollectionUtils.isEmpty(cartSendGoodsList) if(CollectionUtils.isEmpty(cartSendGoodsList)
|| activityListOptional.get().getMcCafeSendGoodsList().stream().noneMatch(o-> o.getSkuId().equals(finalCartSendGoodsList.get(0).getSkuId()))) { || activityListOptional.get().getMcCafeSendGoodsList().stream().noneMatch(o-> o.getGoodsId().equals(finalCartSendGoodsList.get(0).getSkuId()))) {
MCoffeeAddGoodsRequestVo selectGoodsRequest = new MCoffeeAddGoodsRequestVo(); MCoffeeAddGoodsRequestVo selectGoodsRequest = new MCoffeeAddGoodsRequestVo();
BeanUtils.copyProperties(updateShoppingCartGoodsQtyRequestVo, selectGoodsRequest); BeanUtils.copyProperties(updateShoppingCartGoodsQtyRequestVo, selectGoodsRequest);
selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId()); selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
......
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