Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of…

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

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

@@ -457,7 +457,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
                 //return shoppingCartGoodsResponseVo;
             }
-            if (calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getSendGoods())) {
+            if (calculationDiscountResult != null) {
                 sendGoodsQtyCheckForUpdate(cartGoodsList, oldQty, appId, partnerId, userId, storeId, cartGoodsUid, "", shoppingCartBaseService, calculationDiscountResult.getSendGoods());
             }
             // 促销活动的优惠金额计算
@@ -1900,6 +1900,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                         return qty;
                     }
                     cartLimitCount = Integer.parseInt((String)hashMap.get("appValue"));
+                    log.info("cartLimitCount tackingNo:{},,cartLimitCount:{}", LogThreadLocal.getTrackingNo(), cartLimitCount);
                 }
             }
             if(cartLimitFlag == 1 && cartLimitCount != 0 && qty > cartLimitCount){
@@ -1946,6 +1947,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                         return;
                     }
                     cartLimitCount = Integer.parseInt((String)hashMap.get("appValue"));
+                    log.info("cartLimitCount tackingNo:{},,cartLimitCount:{}", LogThreadLocal.getTrackingNo(), cartLimitCount);
                 }
             }
             if(cartLimitFlag == 1 && cartLimitCount != 0 && checkQty+sendQty > cartLimitCount){
@@ -1990,6 +1992,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                         return;
                     }
                     cartLimitCount = Integer.parseInt((String)hashMap.get("appValue"));
+                    log.info("cartLimitCount tackingNo:{},,cartLimitCount:{}", LogThreadLocal.getTrackingNo(), cartLimitCount);
                 }
             }