yujian
2019-09-10 9dfd71c4bde5afe4bf9bb9a8ec07549e4790b992
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -721,6 +721,7 @@
    */
   @RequestMapping(value = "getSpecialChannelActivity")
   public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
      long time = System.currentTimeMillis();
      List<Special> list = specialService.listByPlaceKey("special_channel_activity");
      // 删除尚未启用的过期的
      for (int i = 0; i < list.size(); i++) {
@@ -728,14 +729,21 @@
         if (special.getState() == 1L) {
            list.remove(i--);
         }else{
            if (special.isTimeTask()) {
               if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
                  list.remove(i--);
               } else// 设置倒计时
               {
                  special.setCountDownTime((special.getEndTime().getTime() - time) / 1000);
               }
            }
         }
      }
      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
      Gson gson = gsonBuilder.create();
      JSONObject data = new JSONObject();
      data.put("count", count);
      data.put("count", list.size());
      data.put("list", gson.toJson(list));
      if (!StringUtil.isNullOrEmpty(callback)) {
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));