Merge branch 'dev_4'

yujian

2019-05-14 b1f7380b94ff1189759ed14b563fed6534f73ab0

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -1727,9 +1727,10 @@
         // 缓存半个小时

         redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);

      }



      Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();

      JSONObject root = new JSONObject();

      root.put("time", nextTime.getTimeInMillis());

      root.put("endTime", endTime > 0? endTime : 0);

      root.put("listgoods", array);



      return root;