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

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

@@ -292,7 +292,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                     if(activityListOptional.isPresent()) {
                         List<CartGoods> cartSendGoodsList = assortmentSdkService.getShoppingCartSendGoods(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
                         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();
                             BeanUtils.copyProperties(addShoppingCartGoodsRequestVo, selectGoodsRequest);
                             selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());
@@ -931,7 +931,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 List<CartGoods> finalCartSendGoodsList = new ArrayList<>();
                 finalCartSendGoodsList.addAll(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();
                     BeanUtils.copyProperties(updateShoppingCartGoodsQtyRequestVo, selectGoodsRequest);
                     selectGoodsRequest.setSkuId(activityListOptional.get().getMcCafeSendGoodsList().get(0).getGoodsId());