Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-16 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -387,6 +387,7 @@
         out.print(JsonUtil.loadFalseResult("用户尚未登录"));

         return;

      }

		
      if (StringUtil.isNullOrEmpty(event)) {

         out.print(JsonUtil.loadFalseResult("事件为空"));

         return;

@@ -397,6 +398,7 @@
            || "scanTBCart".equalsIgnoreCase(event)) {

         JSONObject notify = new JSONObject();

         switch (event) {

			
         case "recommendSearch":

            notify.put("name", "完成一次智能搜索");

            notify.put("score", "+20");