Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa

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

@@ -341,6 +341,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, null, shoppingCartBaseService);
         CartGoods cartGoods = null;
         String skuId = "";
+        Integer finalQty = qty;
         for (CartGoods cartGoods_ : cartGoodsList) {
             if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) {
                 cartGoods = cartGoods_;
@@ -350,11 +351,12 @@ public class ShoppingCartMCoffeeServiceImpl {
                     cartGoods_.setQty(cartGoods_.getQty() - (oldQty - qty));
                 }
                 skuId = cartGoods_.getSkuId();
+                finalQty = cartGoods_.getQty();
                 break;
             }
         }
 
-        if(!mcCafeTablewareSkuId.equals(skuId) && qty == 0 && CollectionUtils.isNotEmpty(cartGoodsList) && cartGoodsList.size() == 2) {
+        if(!mcCafeTablewareSkuId.equals(skuId) && finalQty == 0 && CollectionUtils.isNotEmpty(cartGoodsList) && cartGoodsList.size() == 2) {
             for (CartGoods cartGoods_ : cartGoodsList) {
                 if(mcCafeTablewareSkuId.equals(cartGoods_.getSkuId())) {
                     cartGoods_.setQty(0);