Merge remote-tracking branch 'origin/qa' into qa

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

@@ -1663,9 +1663,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 JSONObject jsonObject = (JSONObject)object;
                 HashMap hashMap = JSONObject.parseObject(jsonObject.toJSONString(),HashMap.class);
                 if("cartLimitFlag".equals(hashMap.get("appKey"))){
+                    if (StringUtils.isBlank((String)hashMap.get("appValue"))) {
+                        return;
+                    }
                     cartLimitFlag = Integer.parseInt((String)hashMap.get("appValue"));
                 }
                 if("cartLimitCount".equals(hashMap.get("appKey"))){
+                    if (StringUtils.isBlank((String)hashMap.get("appValue"))) {
+                        return;
+                    }
                     cartLimitCount = Integer.parseInt((String)hashMap.get("appValue"));
                 }
             }